modified:   modify.log
Merge branch 'master' of https://github.com/advx9600/android