summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragowdra <agowdra@google.com>2018-07-12 10:42:29 -0700
committeragowdra <agowdra@google.com>2018-07-12 10:42:29 -0700
commit3181e77243a916184c795fc3e79408747b5a9811 (patch)
tree8eafefc6044e587f2de91bf12b2614c801b8a4b2
parent9da4505facf3ed07db219f3309a6b30d36b21d96 (diff)
downloadplatform_cts-3181e77243a916184c795fc3e79408747b5a9811.tar.gz
platform_cts-3181e77243a916184c795fc3e79408747b5a9811.tar.bz2
platform_cts-3181e77243a916184c795fc3e79408747b5a9811.zip
DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31
Change-Id: I7d35bcb095b1b9a7d2bf35f5f08d31e1a6cb5e43
-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 12f5c7d78e0..5e3317e66f2 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_r30">
+ android:versionName="6.0_r31">
<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 b60d390be3d..19ea96d87bd 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_r30";
+ public static final String CTS_BUILD_VERSION = "6.0_r31";
public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype";
/**