Merge "Merge "Try harder to defeat GLSL compiler dead-code optimizations" into nougat...
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Aug 2017 21:13:42 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 21:13:42 +0000 (21:13 +0000)
commit397828f8e06352b12fcdcc51127dcee66699cfa8
treeaad755add28ec91c80292ca2400259fdc25363f0
parentce1417f4899ad85b7f1f5a892024243a74a7abda
parent4238a089a65522bc2696f05cade0e1054e529acd
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
am: 4238a089a6

Change-Id: I7d4bf6b03ead148b78e66a59c9843c91397235cc