honesty.1211更新
1211
Merge branch 'master' of git@github.com:wisegps/Wawc.git

Conflicts:
	gen/com/wise/wawc/R.java
	res/layout/vehicle_friend.xml
1212
Merge branch 'master' of git@github.com:wisegps/Wawc.git

Conflicts:
	AndroidManifest.xml
	gen/com/wise/wawc/R.java
1213
Merge branch 'master' of git@github.com:wisegps/Wawc.git

Conflicts:
	AndroidManifest.xml
	gen/com/wise/wawc/R.java
	src/com/wise/wawc/MainActivity.java
1216
Merge branch 'master' of git@github.com:wisegps/Wawc.git

Conflicts:
	AndroidManifest.xml
	gen/com/wise/wawc/R.java