finally
Merge branch 'jb-mr1' of github.com:CustoNexus/frameworks_base into jb-mr1