diff options
| author | Daniel Xie <dxie@google.com> | 2016-06-20 20:50:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-20 20:50:27 +0000 |
| commit | cacbd6c8aa2ccb52a69c756f7218bd6dac76a70c (patch) | |
| tree | 0a5a293b880a1b52e3c595c16ece81a3d2ab24fd | |
| parent | bc927019d820382058488b7f0c42e048efd2e166 (diff) | |
| parent | ce4bfc12673c7528d3da1ba323dddfd451f9abce (diff) | |
| download | platform_cts-cacbd6c8aa2ccb52a69c756f7218bd6dac76a70c.tar.gz platform_cts-cacbd6c8aa2ccb52a69c756f7218bd6dac76a70c.tar.bz2 platform_cts-cacbd6c8aa2ccb52a69c756f7218bd6dac76a70c.zip | |
Merge "DO NOT MERGE: Bump CTS to 5.1 R9" into lollipop-mr1-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 256d61d8573..760d0b00922 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="5.1_r8"> + android:versionName="5.1_r9"> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21"/> 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 1445e056837..58b3cece83e 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 = "5.1_r8"; + public static final String CTS_BUILD_VERSION = "5.1_r9"; /** * {@inheritDoc} |