fix
Merge branch 'master' of https://github.com/michaael-l/android.git