| commit | 30f0b1cd369ef6e456c749b51342475a08562fd8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 30 16:44:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 30 16:44:49 2023 +0000 |
| tree | 59dc0d775f8177f97c4ebb0ca63c4e464087b803 | |
| parent | f17b44ef821f89e3139c0b4ca8a96abeef25438c [diff] | |
| parent | af30c9db5ccd728b870e0eeb96cecf4a2a192bc1 [diff] |
Merge "resolve merge conflicts of a29dbb23d695064047203d66aaabd186a2c67c85 to android13-tests-dev" into android13-tests-dev am: 23828d0e8f am: af30c9db5c Original change: https://android-review.googlesource.com/c/platform/cts/+/2512719 Change-Id: Iea3754b1a4c69cf1940c03f3164439d57539940b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>