| commit | dd2e8d6a0e9e5cc6914b852f7f35564526b2a0bc | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 03 19:20:55 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 19:20:55 2015 +0000 |
| tree | 82e5f807003bdbd7366681f3252fe7ad78a8d1ba | |
| parent | 3a67ddeea979e9912110b9fa0cf02dca5b08313d [diff] | |
| parent | c32406e85b8e2a454c96d5ddfb1b494d8853879c [diff] |
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am: 67003be3f8 am: c32406e85b * commit 'c32406e85b8e2a454c96d5ddfb1b494d8853879c':