summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2016-07-20 14:29:46 -0700
committerDaniel Xie <dxie@google.com>2016-07-20 21:30:29 +0000
commitd26da32159c04c7bfa2f13625c51e2b9fd20f6e6 (patch)
tree47e1a8bc901eed5efcbf41f015e4d4fb1ecf4066
parentf76218bb3354d54119e57b8d7569ab51100860aa (diff)
downloadplatform_cts-d26da32159c04c7bfa2f13625c51e2b9fd20f6e6.tar.gz
platform_cts-d26da32159c04c7bfa2f13625c51e2b9fd20f6e6.tar.bz2
platform_cts-d26da32159c04c7bfa2f13625c51e2b9fd20f6e6.zip
DO NOT MERGE: bump cts to 6.0R9
Change-Id: If22485b41262a22399386e8d67dc56c7b84f63de (cherry picked from commit bdbd5a63a6e7ce060d0321cfc0939cf4bc389883)
-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 20b484298af..9b1ec4c2949 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_r8">
+ android:versionName="6.0_r9">
<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 75c777ebcff..181ba5ca6d7 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_r8";
+ public static final String CTS_BUILD_VERSION = "6.0_r9";
public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype";
/**