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

Change-Id: I7ebbccafe780080e0f8a0d88a566d53894c3e099


Trivial merge