tree 7cea4b1c23c5e97b17cd1dd7c4be91139b1f4a0b
parent fd5c175e0712e9bd967720c45d1546336f379f84
parent 0bd48d7b8baa9d43db6065ca250eb991da66a299
author TreeHugger Robot <treehugger-gerrit@google.com> 1602564631 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602564631 +0000

[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 43c44f872a -s ours am: ecb5b4dd72 -s ours am: 0bd48d7b8b -s ours

am skip reason: Change-Id I48fd15262f3c997823955a9b02e13710e69f0bda with SHA-1 7cff1c1374 is in history

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

Change-Id: I529201d1486ffdb2cb597b1135beba512f64dacd