test for merge
Merge branch 'master' of https://github.com/zdmbill1/androidTest.git

Conflicts:
	Tools/src/com/zdm/tools/MainActivity.java