commit 6b482e782ccd9b9f984efcc60e8c1fd486225a61
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri Jul 19 15:15:30 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 19 15:15:30 2019 +0000
tree 2990e9e98c66b486f596d51d0622685f034f8965
parent 1bd5d2520dd92dfbda0b401dab1f806faa78c7a3
parent 14c8e4a59c4623b766701da9c7e30d36d2815525

Merge changes from topic "am-c5942e1870364b5d8a631c29be850268" into qt-r1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a am: 66f932c583 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
  [automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed am: c055afc896 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
  [automerger skipped] VTS : fix vts fail [1/1] am: 70e5b556ef am: 4818d467d7 -s ours am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history