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

Change-Id: Ic0dc4acc742c6687a1cb666ac521f61917637bf7


Trivial merge