summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-10-15 01:16:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-10-15 01:16:09 +0000
commit7b184371775f935abc60e616a22873ffa79ca005 (patch)
tree8a14ff2ae191eaa8154f50195b9582b2f16cce68
parent0fb328e310808823627b7fb706b18f5bbaa4fac5 (diff)
parentcfea1441092f35a4de948f9ebcf58f2a6a16446d (diff)
downloadcts-7b184371775f935abc60e616a22873ffa79ca005.tar.gz
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r26" into oreo-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 a119a978a9d..c5124012792 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="8.0_r25">
+ android:versionName="8.0_r26">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26"/>
diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk
index 07d8cfb5bd1..324f36efd0b 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 := 8.0_r25
+LOCAL_SUITE_VERSION := 8.0_r26
LOCAL_MODULE := cts-tradefed
LOCAL_COMPATIBILITY_SUITE := general-tests