Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Aug 2017 21:13:30 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:13:30 +0000 (21:13 +0000)
am: dc412875c3

Change-Id: I8477ed8f59d97eb6ef365c159e07a673e80860a4


Trivial merge