diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-07-12 20:24:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-12 20:24:09 +0000 |
| commit | d333a47e1fb3cb06df73a80cd495be21cdea61bd (patch) | |
| tree | 8eafefc6044e587f2de91bf12b2614c801b8a4b2 | |
| parent | 9da4505facf3ed07db219f3309a6b30d36b21d96 (diff) | |
| parent | 3181e77243a916184c795fc3e79408747b5a9811 (diff) | |
| download | platform_cts-d333a47e1fb3cb06df73a80cd495be21cdea61bd.tar.gz platform_cts-d333a47e1fb3cb06df73a80cd495be21cdea61bd.tar.bz2 platform_cts-d333a47e1fb3cb06df73a80cd495be21cdea61bd.zip | |
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31" 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 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"; /** |