commit e72616e5b46dba20eee6587d0454f7771c547c05
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 17 02:27:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jul 17 02:27:31 2021 +0000
tree b57c0ca0faf9efd7e0bc4d26066c3286ddf0588f
parent 5e622d0e72dc21b7e91e7904847ec7c7fd131ee3
parent 6a1a67a7f7f46800b1e0a95613963218e6549f01

Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS version to 8.1_r25" into oreo-mr1-cts-dev am: 5ac4887c6d -s ours" into pie-cts-dev am: 4364f7b7d2 -s ours am: bb0a0e61e2 -s ours am: b484f95e92 -s ours am: 1ed449ffd8 -s ours am: 484fc6a81d -s ours am: dce2a4f0c7 -s ours am: bd3410fbb4 -s ours am: 130e97d64a -s ours am: 6a1a67a7f7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icdd980586fc23656713da657fca4520874d3d3f7