del readme.txt
Merge branch 'master' of github.com:cherishqq/androidexamples

Conflicts:
	ApiDemos/readme.txt