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)
commitf69e9e35f8d9ea305a62c9faba302f440ab3ff89
tree1e4969e66bfda4ca2fa455d4fa162efddc9860b4
parente7c4c8b2fd5fb407d0585b5b1a6fca825c432640
parentfea22331f3ba578cb45237b14c5fb108f2cbdc2d
Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat-cts-dev am: aeef6dd8f5 am: fdc198ba11 am: c7970bbd83 am: 8bb630d3e5 am: d76c57f2b6 am: 995657a4be" into nyc-mr2-dev-plus-aosp
am: fea22331f3

Change-Id: Ia58e47cded08b1e5c2e54384442025245a2a9b04