| commit | 1296058420a605a96d504fafc735209ab972725d | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Nov 10 17:07:57 2015 -0800 |
| committer | Daniel Xie <dxie@google.com> | Tue Nov 10 17:07:57 2015 -0800 |
| tree | 409a195ab140bcca4ecce0645e05e7ec5d9abc9c | |
| parent | 4de401fe0d9c2be5f3e88c219e2d4f4b04e13f37 [diff] |
DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2. Change-Id: I9a04aa04a319764593226a4e900cb7bf0555a1c3
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 5e8ab90..3b87bed 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -17,7 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.cts.verifier" - android:versionCode="5"> + android:versionCode="6" + android:versionName="6.0_r2"> <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 782e6ab..a39d8b6 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 @@ @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_r1"; + public static final String CTS_BUILD_VERSION = "6.0_r2"; public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype"; /**