tree 7d7eceaea9094c649711b18f0142db7c1e6ea94c
parent 7cd4d27872d3febfcc80bb43dd5d7c04aaf324c7
parent 50ef042ec37609f833464e882bcf9d78e0b5c693
author Courtney Goeltzenleuchter <courtneygo@google.com> 1502357865 +0000
committer android-build-merger <android-build-merger@google.com> 1502357865 +0000

Merge "Fix DEQP failure regarding VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT:" into oc-dr1-dev am: 4e831d2e4e
am: 50ef042ec3

Change-Id: I7d6c397083f7c95c1d3c7cbc333e115e81e1ac69