commit | 4fdce74459541b24ce52700a7f9c4f93de323d47 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jan 11 15:07:22 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 15:07:22 2016 +0000 |
tree | fadf62a55b6367b372a2696e5a6959da1e82a182 | |
parent | ef3e9e66b04e66d877ac74d84280cc93e37b8b7d [diff] | |
parent | da3a7d4cff5b1269ce06e88d94271cb0d4502afa [diff] |
Merge branch \'mnc-dr1.5-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev am: ddee7d949d am: da3a7d4cff * commit 'da3a7d4cff5b1269ce06e88d94271cb0d4502afa':