tree dc77f53e5b185a9b4b3cf5f35dbac281c754f200
parent db6e9fb776e5c991eda7a38d7ae96f3731687ab4
parent 3d6ca8017d5fb55b5dabc290723467dd469bfabe
author Geoff Mendal <mendal@google.com> 1445450659 +0000
committer android-build-merger <android-build-merger@google.com> 1445450659 +0000

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: 3d6ca8017d

* commit '3d6ca8017d5fb55b5dabc290723467dd469bfabe':