Snap for 10453563 from 1647dd701f16e1ec4092476406763683dec44960 to mainline-permission-releaseaml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010android14-mainline-permission-release

Change-Id: Icc44ca002572d98f1ce7496dac12aa2dc974d37b

2 files changed, 9 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index b62e615..94dfb88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,9 @@ java_library_static {
     sdk_version: "core_current",
     static_libs: ["hamcrest"],
 
+    // b/267831518: Pin tradefed and dependencies to Java 11.
+    java_version: "11",
+
     errorprone: {
         javacflags: ["-Xep:DoNotCall:OFF"]
     }
diff --git a/METADATA b/METADATA
index 98e7e51..4f2aae4 100644
--- a/METADATA
+++ b/METADATA
@@ -6,14 +6,14 @@ third_party {
     value: "https://junit.org/junit4/"
   }
   url {
-    type: ARCHIVE
-    value: "https://github.com/junit-team/junit4/archive/r4.12.tar.gz"
+    type: GIT
+    value: "https://github.com/junit-team/junit4.git"
   }
-  version: "r4.12"
+  version: "r4.13.2"
   license_type: RECIPROCAL
   last_upgrade_date {
-    year: 2016
-    month: 12
-    day: 14
+    year: 2021
+    month: 3
+    day: 3
   }
 }