diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-16 20:18:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-07-16 20:18:13 +0000 |
| commit | 7abe3e0d31151e47df25d21874314ca90c2dde5a (patch) | |
| tree | 791326270b4f4b660948bfdfef7316ade5ca78ea | |
| parent | 7f10cae0d95d7efcc5c6e9548ee1bbfbde1a89b6 (diff) | |
| parent | b2d02093a253d3d455b38dd943bf00a674ef54a5 (diff) | |
| download | cts-7abe3e0d31151e47df25d21874314ca90c2dde5a.tar.gz | |
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 8.0_r25" into oreo-cts-dev
| -rw-r--r-- | apps/CtsVerifier/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tools/cts-tradefed/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 7fcb6a6e4d7..a119a978a9d 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_r24"> + android:versionName="8.0_r25"> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="26"/> diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk index 4df8017054e..07d8cfb5bd1 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_r24 +LOCAL_SUITE_VERSION := 8.0_r25 LOCAL_MODULE := cts-tradefed LOCAL_COMPATIBILITY_SUITE := general-tests |