| commit | f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 21 17:29:54 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 21 17:29:54 2015 +0000 |
| tree | 0f705c1d97a224af03e1f875f78f1e941003e852 | |
| parent | 666af89eac3447a367f6df4f4fddd34942902331 [diff] | |
| parent | 64cd7c6d1e7b243f7839544cb23ab2fad79b86ab [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