Merge "Separate HDR metadata into two tests" am: a34072a77a am: db6a59137c
authorCourtney Goeltzenleuchter <courtneygo@google.com>
Thu, 8 Feb 2018 04:42:20 +0000 (04:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Feb 2018 04:42:20 +0000 (04:42 +0000)
am: 68cd2525b6

Change-Id: I98ab03a88008b8a50159450aa9f017b7def95837

1  2 
android/cts/master/egl-master.txt
modules/egl/teglWideColorTests.cpp

Simple merge
Simple merge