commit | 3a67ddeea979e9912110b9fa0cf02dca5b08313d | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 03 19:19:34 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 19:19:34 2015 +0000 |
tree | 82e5f807003bdbd7366681f3252fe7ad78a8d1ba | |
parent | f4a6dc52b1aa8a2eb216d1893741904228e1d9fe [diff] | |
parent | 5ee15f0be3fcc148335ff53319aac9ba9723dcf8 [diff] |
Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp am: 5ee15f0be3 * commit '5ee15f0be3fcc148335ff53319aac9ba9723dcf8':