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

Change-Id: Id0387a01061c95f4c51728c8af917aa63354097b


Trivial merge