my commit
Merge branch 'master' of https://github.com/startracker/Android-L-for-taoshan