commit | ce1c806c8799403582c96e8bd870405198efba9f | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:39:44 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:39:44 2015 +0000 |
tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 | |
parent | df21f6bbc0f48ace2dabddcb13d0a3c96dce0694 [diff] | |
parent | 22e23d1dd475f46fd1129642bdfe1e0275a6d4f0 [diff] |
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 899d016e89 am: 22e23d1dd4 * commit '22e23d1dd475f46fd1129642bdfe1e0275a6d4f0':