添加gen文件忽略
Merge branch 'master' of
https://github.com/yanchangyou/helloworld-android.git

Conflicts:
	apps/change-color/.gitignore