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

Change-Id: I0881071cbe55d861c25f7da65581830ea8e42094


Trivial merge