Create zyxdemo
Delete zyxdemo
zyx update
Merge branch 'zyxdemo' of https://github.com/zhuyuxuandtc/haidaodemo into zhuyuxuandtc-zyxdemo

Conflicts:
	ActivityA/bin/HaidaoTeam.apk
	ActivityA/bin/classes.dex
	ActivityA/bin/classes/com/example/android/lifecycle/ListViewAdapter.class
	ActivityA/bin/classes/com/example/android/lifecycle/MainActivity$1.class
	ActivityA/bin/classes/com/example/android/lifecycle/MainActivity.class
	ActivityA/bin/classes/com/example/android/lifecycle/R$id.class
	ActivityA/bin/classes/com/example/android/lifecycle/R$layout.class
	ActivityA/bin/classes/com/example/android/lifecycle/R$string.class
	ActivityA/bin/classes/com/example/android/lifecycle/R$style.class
	ActivityA/bin/resources.ap_
	ActivityA/gen/com/example/android/lifecycle/R.java
Merge branch 'zhuyuxuandtc-zyxdemo'