| commit | 67003be3f8a53c1d11d130d53d866255bd04d2c7 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 03 17:06:57 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 03 17:06:57 2015 +0000 |
| tree | df915085c040cbe2f37ecfda6a053a82cd51728a | |
| parent | af588a31bc62b791014b3cc4e655107e9446e3d0 [diff] | |
| parent | d5cefab28c6ce307356d691f855cfdcaa8bafc4f [diff] |
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master