Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:17:48 +0000 (17:17 +0000)
am: fdc198ba11

Change-Id: Ieb66f942f4d5e690f1cdfecfc92144deca46d12a


Trivial merge