DO NOT MERGE: Bump CTS and CTS Verifier version to 12_r6
Bug : b/238402645
Change-Id: Ib96c168679cdbf8dc1040943fdf972a179aaff46
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 132fb87..989e12d 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_r5">
+ android:versionName="12_r6">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31"/>
diff --git a/tools/cts-tradefed/Android.bp b/tools/cts-tradefed/Android.bp
index d5aa4bc..76f7902 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_r5",
+ version: "12_r6",
static_libs: ["cts-tradefed-harness"],
required: ["compatibility-host-util"],
}