| commit | 175cef67ec887b5f4d33a7494459c80b9a0e0895 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Oct 21 16:53:53 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 16:53:53 2015 +0000 |
| tree | 9f84fc865fd695ef34161259c7eafea5f6dfa566 | |
| parent | 30866628b82b93824c08219eb4a43af26a0291df [diff] | |
| parent | e1d95ccf5c8e85d92470e4e507f82bf803ad37bc [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