commit | 517e67f9b0dbcbb179cb44a4c0dca8d002b7f496 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:58:09 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:58:09 2015 +0000 |
tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 | |
parent | fd9f72520f7f630fe5fa6890a1264e54c2ee1d8b [diff] | |
parent | 129ae4421df203b4f5cb5b1bd572cffdecfb32da [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: 129ae4421d * commit '129ae4421df203b4f5cb5b1bd572cffdecfb32da':