| commit | fafb9f21b06ed62b59a8cf542bf76d024673145b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 03 19:02:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 03 19:02:43 2020 +0000 |
| tree | 60fcac76ad46cfaaa7ef211a67a2f80a40734229 | |
| parent | 45c3279ed7ad9132622ed5d09f6476d331c7dfb2 [diff] | |
| parent | 084eb7d65812a8dd72b5f366dfbfa0e36deb5bdd [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE]: STS: Set testPocCVE_2017_0540 to high-memory" into oc-dev am: 41f84bc415 am: 0b7e5fa6d2 am: 963e8dc217 -s ours am: 1721d51311 -s ours am: 084eb7d658 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/11710088 Change-Id: I441417c106bab15a5a80c9294a3d6abf5de4f492