commit 011dc05ac7a29d4fb58030b45f39693d12eb38cc
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 07 23:47:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 07 23:47:17 2017 +0000
tree dccae254aea75e8163f1fefa0f7fe48971d1c1c2
parent e90c42e63a81e846a2a5d73d4344b47c5986ff89
parent b98a31b336f2a9f01e433910312a303668970699

Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r12" into nougat-mr1-cts-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 97f0ccf..0908a48 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="7.1_r11">
+      android:versionName="7.1_r12">
 
     <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/>
 

tools/cts-tradefed/Android.mk

diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk
index 7b4a8cd..0ef8a82 100644
--- a/tools/cts-tradefed/Android.mk
+++ b/tools/cts-tradefed/Android.mk
@@ -25,7 +25,7 @@
 LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH)
 LOCAL_SUITE_NAME := CTS
 LOCAL_SUITE_FULLNAME := "Compatibility Test Suite"
-LOCAL_SUITE_VERSION := 7.1_r11
+LOCAL_SUITE_VERSION := 7.1_r12
 
 LOCAL_MODULE := cts-tradefed