commit ae7de2c478627e59bd789d1124e8924206eebf0f
author Anitha Satish Gowdra <agowdra@google.com> Mon Jan 10 23:36:46 2022 +0000
committer Anitha Satish Gowdra <agowdra@google.com> Mon Jan 10 23:43:48 2022 +0000
tree 8e3f90e71022de5f7decf13c4c927cddeb0e5348
parent a16de1dc838f112691b936ba16502e2eb83466cb

DO NOT MERGE: Bump CTS and CTS Verifier version to 12_r4

Bug : b/213894539

Change-Id: I27a20742c4d2f01823999871813a896e34fb6c18

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index c0b0871..07f6cde 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_r3">
+          android:versionName="12_r4">
 
     <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 98199da..0fd539c 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_r3",
+    version: "12_r4",
     static_libs: ["cts-tradefed-harness"],
     required: ["compatibility-host-util"],
 }