name fix
Merge branch 'master' of https://github.com/dongorigin/Android-Demo.git
trim