slim baby
Merge branch 'staging' of https://github.com/ValidusAOSP/frameworks_base into staging