Merge branch 'master' of https://github.com/Orange1987/Android
Merge branch 'master' of https://github.com/Orange1987/Android