commit | 56749759f6605349396ba29fbfc0221a730f48df | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:43:30 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:43:30 2015 +0000 |
tree | dc77f53e5b185a9b4b3cf5f35dbac281c754f200 | |
parent | f93050086e000930ab65a6e0808e7b8d8048d0ee [diff] | |
parent | 55b64e1de62a1f1cb26e9d6a8ded162d112c59b9 [diff] |
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 9db863761e am: 55b64e1de6 * commit '55b64e1de62a1f1cb26e9d6a8ded162d112c59b9':