tree ce2bfc2ac160cc2e7236df21ce0b9cb2588e6157
parent 326969c82f33e787453f1bdc51e9d74c1462a774
parent 4196509d227757be2434b7128122c3a3c8c4097e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1696038536 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696038536 +0000

[automerger skipped] Merge "Add a generics test plan with multiple includes" into android13-tests-dev am: 4196509d22 -s ours

am skip reason: Merged-In I4af790226050636d4deec992d0fdb59a37159e5e with SHA-1 55dce17e70 is already in history

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

Change-Id: I48b7953784db3c68610d1e03b69d213aeeb7263a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>