| commit | 67f0e9e34e7762840bb758e53d0c6cb0cc52786e | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Fri Apr 29 20:58:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 29 20:58:06 2016 +0000 |
| tree | dbad7a372988a8f0131c78a01577adc5340400e8 | |
| parent | ac9bb5a3e371c2d8b91926bee26828db0ad6e898 [diff] | |
| parent | 8770b5bda5387159fe10daa654830e20e5ad1d43 [diff] |
Merge "Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev am: 188b9f0035 am: 1bd3ef2f3b" into nyc-mr1-dev-plus-aosp am: 8770b5bda5 * commit '8770b5bda5387159fe10daa654830e20e5ad1d43': Change-Id: Ia2bea99b195d416d51c5c0661bd8a60893f5003a