Back to the future
Merge branch 'jb-mr2' of https://github.com/IOKP/frameworks_base into jb-mr2