Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: 272da5f8cf
* commit '272da5f8cf7f558bd239443e16347b4de0feda1a':
This commit is contained in: