| commit | 7f612d4830ae3d081642877c270c6b23b02705fd | [log] [tgz] |
|---|---|---|
| author | Craig Donner <cdonner@google.com> | Tue Nov 08 20:25:12 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 08 20:25:12 2016 +0000 |
| tree | 7157e01bdcd7c4f898b724f953b266ec8a5cd537 | |
| parent | 23c8e1345cb108904b9012bca5b258c310cb2521 [diff] | |
| parent | 54dd92287d24406a8f46bcd4ffc60c807ddc01ab [diff] |
Merge "Keep protected content in EGLImage attrs as needed." am: 5a03327fa8 am: e86b7fb0cf am: 54dd92287d Change-Id: I8d7dd4c285303b4ae69e758feb7cebd6f4bafa65