derp
Merge branch 'master' of https://github.com/Team-Kang-Droid/android