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:42:43 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Apr 2017 17:42:43 +0000 (17:42 +0000)
commit4238a089a65522bc2696f05cade0e1054e529acd
tree1e4969e66bfda4ca2fa455d4fa162efddc9860b4
parentdc412875c3bf7ed6ef960bd58c9955465d804f71
parent1039da878e7c40860fb7a002c92aa09f42f6fd66
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5 am: a4ddab16dd" into nyc-mr1-dev am: 768446b015 am: 1e68201377 am: 14221e7f43
am: 1039da878e

Change-Id: I255808b4435983a5784d2bbc291245adef55e294