commit 71c5755a23ff7adf4be95b2d64284c3c9311f92e
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 05 17:27:36 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 05 17:27:36 2022 +0000
tree dbb6dcc1622e2be90c470a8601b940dab9ea3e0b
parent 230ba6ecdd152d85acc028d3168fe683bb8a4f12
parent 486f4c9ad8c2cbc30dbbad9f89b6de1740e60c89

Merge "DO NOT MERGE: Bump CTS and CTS Verifier version to 12.1_R2" into android12L-tests-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 7e0994f..b724268 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -18,7 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.cts.verifier"
           android:versionCode="5"
-          android:versionName="12.1_r1">
+          android:versionName="12.1_r2">
 
     <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31"/>
 

tools/cts-tradefed/Android.bp

diff --git a/tools/cts-tradefed/Android.bp b/tools/cts-tradefed/Android.bp
index dee557e..5df34dc 100644
--- a/tools/cts-tradefed/Android.bp
+++ b/tools/cts-tradefed/Android.bp
@@ -34,7 +34,7 @@
     wrapper: "etc/cts-tradefed",
     short_name: "CTS",
     full_name: "Compatibility Test Suite",
-    version: "12.1_r1",
+    version: "12.1_r2",
     static_libs: ["cts-tradefed-harness"],
     required: ["compatibility-host-util"],
 }