修改

Change-Id: I4c66a749544d43c44d5b6ffe9202a69edaa69fbd
Merge branch 'master' of https://github.com/denghui1010/repos.git

Conflicts:
	瑙嗛鎾斁/bin/classes.dex
	瑙嗛鎾斁/bin/resources.ap_
	瑙嗛鎾斁/bin/瑙嗛鎾斁.apk