| commit | 8770b5bda5387159fe10daa654830e20e5ad1d43 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Apr 29 20:56:02 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 29 20:56:02 2016 +0000 |
| tree | 5ca8020b8b41c291bdf5f8d7da65a29888ae6026 | |
| parent | a0b9c4759bafa1dc57158edb5a7f51713923f8bd [diff] | |
| parent | 8ea87dfc61b2704a0cddbc934ae4d5e1654c54bc [diff] |
Merge "Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev am: 188b9f0035 am: 1bd3ef2f3b" into nyc-mr1-dev-plus-aosp