tree b5e310853a7912c1e1c5b23241420414683dd506
parent 8d99a89b85694a4512851328e66a89da4e9b41bc
parent 13a64e1c3992293eb368089dc40acec046eda7a1
author Sorin Basca <sorinbasca@google.com> 1675936305 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1675936305 +0000

Merge "Pin tradefed dependencies to Java 11" am: c9f2168694 am: 13a64e1c39

Original change: https://android-review.googlesource.com/c/platform/external/jsr305/+/2419110

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