Snap for 9710098 from fe03c97878f5a4a8633ba0f918fedb58c315fa5a to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Icb36dc3cf70fef19f5eff33d40e39c7053640bce

1 files changed, 3 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 6e9d86a..f4d0a1d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,4 +40,7 @@ java_library_static {
     sdk_version: "current",
     // TODO(b/237039251) use "apex_inherit" when Java modules support it
     min_sdk_version: "29",
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
+
 }