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:22:52 +0000 (17:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:22:52 +0000 (17:22 +0000)
am: 8ca5b73a02

Change-Id: I278dbd93f410e6880a0a9d5b10d0c1268fa43f26


Trivial merge