tree d6151fcf99cbed1b176cd3ea47280313a5e2379d
parent 235cdaf522e09fc9afaf338154db24d161ae7ad1
parent befd15678e0f3852f53c3ace020e63a2fc644479
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605120265 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605120265 +0000

Merge "[automerger skipped] Merge "DO NOT MERGE: Increase timeout in testDelegatedCertInstaller" into oreo-mr1-cts-dev am: cd2bb58006 -s ours" into pie-cts-dev am: ba246f66d8 -s ours am: 5318d13fc9 -s ours am: d0050e750a am: befd15678e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5392fa06a0c039cd8b97750fcbc1a47bb692f3e4