summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-08-09 02:43:06 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-08-09 02:43:06 +0000
commit8ca6717acb1161755c566d1d00b65f64f401a689 (patch)
tree97871524f2e728bd8b0b415f188092c78a89f3e1
parent2f3e933650aa41bf870aa5fe1c52f7d55f47f77a (diff)
parent66d999f3f8c64be1862ab37150527a21cefcc1fa (diff)
downloadcts-8ca6717acb1161755c566d1d00b65f64f401a689.tar.gz
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 7.1_r9" into nougat-mr1-cts-dev
-rw-r--r--apps/CtsVerifier/AndroidManifest.xml2
-rw-r--r--tools/cts-tradefed/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index ecd35f3b751..258c3c78721 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_r8">
+ android:versionName="7.1_r9">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/>
diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk
index 8fb638c8a8a..d202fbcb16f 100644
--- a/tools/cts-tradefed/Android.mk
+++ b/tools/cts-tradefed/Android.mk
@@ -25,7 +25,7 @@ LOCAL_SUITE_BUILD_NUMBER := $(BUILD_NUMBER_FROM_FILE)
LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH)
LOCAL_SUITE_NAME := CTS
LOCAL_SUITE_FULLNAME := "Compatibility Test Suite"
-LOCAL_SUITE_VERSION := 7.1_r8
+LOCAL_SUITE_VERSION := 7.1_r9
LOCAL_MODULE := cts-tradefed