commit | 6cf2272c1fc2323149b766782e32a6da5214695b | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Apr 01 02:40:07 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 01 02:40:07 2021 +0000 |
tree | f6f064362ff11271d507fed875723287378a56d7 | |
parent | 8929a980f0d43ce03953187644f0caeb6df9e884 [diff] | |
parent | 654475850442aa34f59a1158086bedfa3c12bfd8 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS test fix for CVE-2018-11261" into oc-mr1-dev am: 554adca0f4 -s ours am: 6544758504 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/14006418 Change-Id: I0a5a841a089cf1642990ebfaf5b36598eddd9c4f