summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragowdra <agowdra@google.com>2018-08-16 11:49:51 -0700
committeragowdra <agowdra@google.com>2018-08-16 11:49:51 -0700
commit48523104c7f58e841db58290bf1c9cdd7acb5a8b (patch)
treeb1e81aa1f69cf81518759f6d22589e68e26e5421
parent936034e8d54997d1ba33ecc9c0515616e1b8fed1 (diff)
downloadplatform_cts-48523104c7f58e841db58290bf1c9cdd7acb5a8b.tar.gz
platform_cts-48523104c7f58e841db58290bf1c9cdd7acb5a8b.tar.bz2
platform_cts-48523104c7f58e841db58290bf1c9cdd7acb5a8b.zip
DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r32
Change-Id: Ia1a7f59021f02db7c65fd7801836dcea87df0afa
-rw-r--r--apps/CtsVerifier/AndroidManifest.xml2
-rw-r--r--tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java2
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";
/**