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:55 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:13:55 +0000 (21:13 +0000)
am: e7c4c8b2fd

Change-Id: I81dab721991b1a84393ef70d921f379e8e9b3d8d


Trivial merge