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

Change-Id: Ia58e47cded08b1e5c2e54384442025245a2a9b04


Trivial merge