| commit | 5ee15f0be3fcc148335ff53319aac9ba9723dcf8 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 03 17:14:11 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 17:14:11 2015 +0000 |
| tree | 79a9cf3d87b48ea24e3916bf95be74b6b95b7975 | |
| parent | 630f65810860cbd15012a1d5e83a275695e332cd [diff] | |
| parent | ead3f44aefb76f7fefd612c262ba5a1800f23548 [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