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)
commit14221e7f4325ec25dde0853854140b27dfb432ab
tree4b6385d2229d3aac01a31f97c422b67efde9b610
parent995657a4be7f4d46729de8ff4998a0f6dc3255b5
parent1e68201377b24a279c5d3f8dcb54964b20229586
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

Change-Id: I3b9cde7321a9a4907c4de9c7c080bb93f7b7cb34