commit | 947dada111e47304b5a1bb9592490f2b42138ada | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:25:38 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:25:38 2015 +0000 |
tree | 73e51c755f4aa6d138e325fed3678c3bf60696d3 | |
parent | 86b9bcd90771947bb0f46aecbe6849d5e22821c9 [diff] | |
parent | 9bf6d96370414d61f5924335ef48c97e71dd41df [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