commit | 25ea04d5f2be2a86c05c3ed01fdf544e8843bd12 | [log] [tgz] |
---|---|---|
author | Craig Donner <cdonner@google.com> | Tue Nov 08 20:30:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 08 20:30:11 2016 +0000 |
tree | 37566e9c1621ba91a88789ae48edacf3a4c412a9 | |
parent | 7fa1d5935a19a35f6a58458b93a4397cb74f44f0 [diff] | |
parent | 7f612d4830ae3d081642877c270c6b23b02705fd [diff] |
Merge "Keep protected content in EGLImage attrs as needed." am: 5a03327fa8 am: e86b7fb0cf am: 54dd92287d am: 7f612d4830 Change-Id: I3e26e9d5cb164154c3408a165c90ec534542c2c0