diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-16 20:46:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-16 20:46:45 +0000 |
| commit | 18db382f11af3c80367c3c60a29ee41ddf3cb79b (patch) | |
| tree | b1e81aa1f69cf81518759f6d22589e68e26e5421 | |
| parent | 936034e8d54997d1ba33ecc9c0515616e1b8fed1 (diff) | |
| parent | 48523104c7f58e841db58290bf1c9cdd7acb5a8b (diff) | |
| download | platform_cts-18db382f11af3c80367c3c60a29ee41ddf3cb79b.tar.gz platform_cts-18db382f11af3c80367c3c60a29ee41ddf3cb79b.tar.bz2 platform_cts-18db382f11af3c80367c3c60a29ee41ddf3cb79b.zip | |
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r32" into marshmallow-cts-dev
| -rw-r--r-- | apps/CtsVerifier/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 5e3317e66f2..99f9d2ce549 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="6.0_r31"> + android:versionName="6.0_r32"> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23"/> diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java index 19ea96d87bd..95eba3c3b6a 100644 --- a/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java +++ b/tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java @@ -31,7 +31,7 @@ public class CtsBuildProvider implements IBuildProvider { @Option(name="cts-install-path", description="the path to the cts installation to use") private String mCtsRootDirPath = System.getProperty("CTS_ROOT"); - public static final String CTS_BUILD_VERSION = "6.0_r31"; + public static final String CTS_BUILD_VERSION = "6.0_r32"; public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype"; /** |