delete unused code
Merge branch 'master' of github.com:Trinea/AndroidDemo