Merge branch 'master' of https://github.com/wwilk/android.git