| commit | 4931fb298e076212981b2acae6752743d7340f02 | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Mon Jun 13 23:25:23 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jun 13 23:25:23 2016 +0000 |
| tree | 00e8f3e2789a1ac9df388752a4aa930a5ec6e0da | |
| parent | 8fc10c310ec3fe66d68ea2a90702ee31b329750a [diff] | |
| parent | e1e1e75173d557466e824782c61802a8415c7073 [diff] |
Merge \"Revert \"GLConsumer: add build-time disable of gpu protected content\"\" into nyc-dev am: e1e1e75173 Change-Id: Iea28323a8e7bd2333d396b70703ac4b1a99b1911