| commit | 54dd92287d24406a8f46bcd4ffc60c807ddc01ab | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Tue Nov 08 20:19:40 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 08 20:19:40 2016 +0000 |
| tree | 93b73cc95cc27c1808678c40f1150104c1c1ffb4 | |
| parent | 53cb11bcdc96f0b4f390be9d43da903718e93a3d [diff] | |
| parent | e86b7fb0cf7fc3cbddd31d319c65c3d5a73406b4 [diff] |
Merge "Keep protected content in EGLImage attrs as needed." am: 5a03327fa8 am: e86b7fb0cf Change-Id: I6838c4f9c3885a0cc7e27355b5163c132e9f7b3e