Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 11 Apr 2017 17:31:35 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:31:35 +0000 (17:31 +0000)
am: 1e68201377

Change-Id: I3b9cde7321a9a4907c4de9c7c080bb93f7b7cb34


Trivial merge