reset head to commit: "fix"
Merge https://github.com/kangaosp/frameworks_base into kk