a
Merge branch 'master' of https://github.com/andyngoc/repos into new6
a
Merge branch 'master' of https://github.com/andyngoc/repos
a
a
Merge remote-tracking branch 'remotes/origin/master' into tmp1

Conflicts:
	helloword1/src/com/example/helloword1/MainActivity.java
a