build log commit
Merge branch 'Merge0920'

Conflicts:
	build.log
	build/android/bin/app-unsigned.apk
	build/android/bin/app.ap_
	build/android/bin/app.apk