tree 73e51c755f4aa6d138e325fed3678c3bf60696d3
parent fdc7acf182b1664351c7d5c37273386a2abc5f92
parent 9db863761e42dd92dbb2be53eeac8e5a9b81c682
author Geoff Mendal <mendal@google.com> 1445448096 +0000
committer android-build-merger <android-build-merger@google.com> 1445448096 +0000

Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev
am: 9db863761e

* commit '9db863761e42dd92dbb2be53eeac8e5a9b81c682':