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

Change-Id: I1899ece215ce5c0495694f8df018618ff8c59b25


Trivial merge