| commit | 272da5f8cf7f558bd239443e16347b4de0feda1a | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Tue Oct 20 18:34:32 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 18:34:32 2015 +0000 |
| tree | 729b938033599d0d422ba3ae567cacfe20c56871 | |
| parent | 647afb199eb60f20bf3dcc49d48bffd46bb2d0d5 [diff] | |
| parent | 096d13faaf19beec8c46edf5df23efc357c9b8a7 [diff] |
Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp