Merge branch 'jb-mr1.1-release' of https://android.googlesource.com/platform/frameworks/base into jb-stock