Merge Android 24Q1 Release (ab/11220357)temp_319669529

Bug: 319669529
Merged-In: I1defb63c3420dcb736aa0a9763d56a9660acb3d8
Change-Id: Ib8ce8c33c782aa440d1d6635bdfb780c5c7ad9e7

1 files changed, 2 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 8ac33877..213a7c66 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,4 +39,6 @@ java_library {
     ],
     sdk_version: "core_current",
     min_sdk_version: "30",
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
 }