tree d01a7dff46a9a8278a31e00a4d9ca22c28e38c3c
parent fa3f2f992591e8b29a686fa7c81ee1aa272d4e30
parent ff029d8ae01928480a6d0c11eac4c720dd9538e2
author TreeHugger Robot <treehugger-gerrit@google.com> 1608002531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608002531 +0000

[automerger skipped] Merge "STS test for Android Security CVE-2021-0306" into oc-dev am: 91671074b2 -s ours am: fb89756797 -s ours am: 2dd1ecf242 -s ours am: db181b7e62 -s ours am: c090ce0541 -s ours am: ff029d8ae0 -s ours

am skip reason: Change-Id I9b6a1a7434b6196375894462aeed5c770fb10af6 with SHA-1 13822e1d0a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4468c12a844b6bef7c8c43ec410215e9b02cc1ca