local master
Merge branch 'master' of https://github.com/aopi1125/demo

Conflicts:
	aa/src/com/example/aa/MainActivity.java