add newlock
Merge branch 'master' of https://github.com/zfwz/android