tree af0e16adcaceb29f1ea198f19adb938051c86816
parent 2581f923fb3e64c5dfb24625c76779f9f1e7817e
parent 1fcf024d4e44c67c0d7a81280369d07341c9cb7c
author Android Build Prod User <android-build-prod@system.gserviceaccount.com> 1630013149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630013149 +0000

[automerger skipped] Merge "STS test for Android Security CVE-2020-29661" into qt-dev am: 043a16448a am: de4984b528 am: 27a113281c am: 90938843a6 -s ours am: 1fcf024d4e -s ours

am skip reason: Merged-In I6b30b85f4c17064dda8347c17105088ff4ca44a7 with SHA-1 355a91b61a is already in history

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

Change-Id: I0f02a97a49acb7ab7b9cb7bb312a554890e7edde