tree 5e932dc7560c9a9b3a975b5fbba8e6efc6069f91
parent 436d8b4aece4e87a987ee85e98428134e86d5d80
parent 4e831d2e4e078b74d34bd16c05ff02a3d741becd
author Courtney Goeltzenleuchter <courtneygo@google.com> 1502347611 +0000
committer android-build-merger <android-build-merger@google.com> 1502347611 +0000

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

Change-Id: Ic931253156a23da71112fb6608427efee54b77e4