| commit | 077f2c9c6be854a08df2b665d22b821bbf2dde29 | [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 | 0bc2b0ac99f14879915865de70d831b1f96d6b68 | |
| parent | 385f839a2c447bd6b0b2b248001ad7505394ed42 [diff] | |
| parent | 1bb0a5109299031b1f2afe6df576e5dfc06249bf [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