1
111
Merge branch 'master' of git@github.com:wisegps/Wawc.git

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

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