| commit | fbfdcec71cab0e9cf91de6a8670b67687c71a47a | [log] [tgz] |
|---|---|---|
| author | Ian Elliott <ianelliott@google.com> | Thu Jul 20 23:08:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 23:08:54 2017 +0000 |
| tree | 2e905657e88d7f69001bde84206ea6356662401c | |
| parent | b11d9c848a77e5bf1cb14f7610431357af8255d1 [diff] | |
| parent | b386b22ee24c4bdc2dd0584be4f53bc641b5a2dc [diff] |
Merge "Fix compatibility problems with newer GLES Khronos headers." am: 61fbde2446 am: 104fc9efc7 am: a2729f0fae am: 4f4b0cacbf am: b386b22ee2 Change-Id: Ib48d7d51165713ec171969b43e8f4455df0a175f