feedback

zouzou update feedback
Merge branch 'feedback' of https://github.com/zouzou6321/haidaodemo into zouzou6321-feedback

Conflicts:
	ActivityA/src/com/example/android/lifecycle/MainActivity.java