Change-Id: I36b30f30c517f7189503e6f956a281664280eeba
Signed-off-by: lin <lin@p_wenhlin-NB0.tencent.com>
aaMerge branch 'master' of https://github.com/chixin/first

Conflicts:
	F/AndroidManifest.xml
	F/src/com/my/gps/MapTest.java