| commit | 3d6ca8017d5fb55b5dabc290723467dd469bfabe | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:28:55 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:28:55 2015 +0000 |
| tree | 0f705c1d97a224af03e1f875f78f1e941003e852 | |
| parent | 86f2721e961863adfb58604c41bb70a232112e2c [diff] | |
| parent | aca0e50f86084e0b3f51a53237fe3f1553f67d84 [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