android 智能设备入库
Merge branch 'master' of file:///D:\git\adt\znmobile

Conflicts:
	lint.xml
gps