e
edit
Merge remote-tracking branch 'origin/master2'
啊
啊啊
Merge branch 'master2'

Conflicts:
	src/com/nedu/android_ui_16/Android_UI_16Activity.java
d
e
ee
Merge branch 'master2'

Conflicts:
	src/com/nedu/android_ui_16/Android_UI_16Activity.java