tree fb190ab656e01ef4a580f28b309e200bbb51a10e
parent 1809b884f367b584639a8bd0547fa766590c5065
parent 3a134692da6bea74405027eb8e1a2ef294a04d8e
author TreeHugger Robot <treehugger-gerrit@google.com> 1601404443 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601404443 +0000

Merge changes Ia94ca352,Iad72a3e6 into qt-dev am: afc6787a4d am: f5b3b0211f am: d5ece0c9db am: 3a134692da

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

Change-Id: I94135b2b8d9169543f79e2a5bbb467ed9c24ca74