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

Change-Id: Ifb6fbc3ef6f04204570b1f9814318367c7f5c47d


Trivial merge