tree dc77f53e5b185a9b4b3cf5f35dbac281c754f200
parent a1098c7b68123a596a04d83ca12b8dc2ef4d4087
parent f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1
author Geoff Mendal <mendal@google.com> 1445451075 +0000
committer android-build-merger <android-build-merger@google.com> 1445451075 +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: f4bce5229e

* commit 'f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1':