commit | dcfaf7308e4d813eca6b30cd197e489da1e8f1b1 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:48:44 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:48:44 2015 +0000 |
tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 | |
parent | ae1f8b3c447e660cf0e29c4e19e16f837e5acec0 [diff] | |
parent | ae2a8ef527e79349f1ebd99780c50bb5b9107db8 [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 am: ae2a8ef527 * commit 'ae2a8ef527e79349f1ebd99780c50bb5b9107db8':