derp
Merge github.com:ResurrectionRemix/android_frameworks_base into kitkat1