Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Aug 2017 21:14:07 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:14:07 +0000 (21:14 +0000)
commit2449a521f62b9b8271c5fc5a2a363672d36716a0
treeaad755add28ec91c80292ca2400259fdc25363f0
parentebf92a9ef0087d939cf340cd3438a7cc41614704
parentf69e9e35f8d9ea305a62c9faba302f440ab3ff89
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5 am: fdc198ba11 am: c7970bbd83 am: 8bb630d3e5 am: d76c57f2b6 am: 995657a4be" into nyc-mr2-dev-plus-aosp am: fea22331f3
am: f69e9e35f8

Change-Id: I956dc5f619f030d91a7cb6c20bffe6dc3aad863a