aosp stock
Merge branch 'master' of https://github.com/svlog/android_frameworks_base