diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-09 02:22:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-09 02:22:43 +0000 |
| commit | 6a48394c665f66c997e46a6912eabd4ca600d3c2 (patch) | |
| tree | a64f9fd0de570a89eac6f61a0c9db876b10ff918 | |
| parent | 40088685882d0f1e87b644e1e1480755d368fb98 (diff) | |
| parent | b81bdd6cbee5e0f173e8bb88331fd119562afe89 (diff) | |
| download | cts-6a48394c665f66c997e46a6912eabd4ca600d3c2.tar.gz | |
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r22" 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 a7578f49dfa..f58759b1cae 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_r21"> + android:versionName="6.0_r22"> <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 b3bb214663d..ad0ae71a29c 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_r21"; + public static final String CTS_BUILD_VERSION = "6.0_r22"; public static final String CTS_PACKAGE = "com.android.cts.tradefed.testtype"; /** |