| commit | c32406e85b8e2a454c96d5ddfb1b494d8853879c | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 03 17:15:06 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 17:15:06 2015 +0000 |
| tree | 79a9cf3d87b48ea24e3916bf95be74b6b95b7975 | |
| parent | 5ee15f0be3fcc148335ff53319aac9ba9723dcf8 [diff] | |
| parent | 67003be3f8a53c1d11d130d53d866255bd04d2c7 [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 * commit '67003be3f8a53c1d11d130d53d866255bd04d2c7':