commit | a768d05f47ee0258af295db0a6f9eea3eea33485 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:22:33 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:22:33 2015 +0000 |
tree | 73e51c755f4aa6d138e325fed3678c3bf60696d3 | |
parent | 54d2bf811db2b62878a3afee4d9ec384d8efd0f7 [diff] | |
parent | fc7130c91323dd76d4e167901207c1934e91ada1 [diff] |
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: fc7130c913 * commit 'fc7130c91323dd76d4e167901207c1934e91ada1':