init
edit
edit 2
edit3
edit buy a
Merge branch 'master' of https://github.com/dloveao-test/test4git

Conflicts:
	src/com/nedu/android_ui_16/Android_UI_16Activity.java
Eclispe
edt
no message
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
Merge branch 'release/release' into production

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