tree 90f27c58b0281b2a64aa7af63c2d71e11bfe3b0d
parent 924075e3d7a479afb5f4ecae5988c1a937db14c1
parent a52d7ff755171227f49e21c874d0bca4ac5f1cce
author Treehugger Robot <treehugger-gerrit@google.com> 1608407519 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608407519 +0000

[automerger skipped] Merge "CameraITS: Skip param_tonemap_mode if contrast_curve mode is not supported" into pie-cts-dev am: f974eed18d am: ee6a7bb9df am: d29e461733 am: a52d7ff755 -s ours

am skip reason: skipped by user hanlinchen

Original change: https://android-review.googlesource.com/c/platform/cts/+/1490248

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I603d058f1d99a1939ded3e0e133237cea824144f