langlang
Merge branch 'jb-mr1' of https://github.com/ThinkingBridge/platform_frameworks_base into jb-mr1