change some config file;
nothing
Merge branch 'master' of github.com:erhu/android-demo