Merge "Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations"...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Aug 2017 21:14:17 +0000 (21:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:14:17 +0000 (21:14 +0000)
am: d07ebc4c7d

Change-Id: I847d8f2671cf6b2443c7e58531839d17bb2aaf1b


Trivial merge