diff options
| author | Daniel Xie <dxie@google.com> | 2016-09-07 17:09:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-07 17:09:02 +0000 |
| commit | a8a493191f56ee00008210db3eee6982a9924087 (patch) | |
| tree | e87da20db7344d4261e76169113aabaef2b429d7 | |
| parent | 6e1c0064df22e7a8bb723044db1baae5646b2556 (diff) | |
| parent | 8e964764b9a3a4dd2ffa40082353ea16bda28fa9 (diff) | |
| download | cts-lollipop-cts-release.tar.gz | |
Merge "Revert "DO NOT MERGE: Bump Cts to 5.0R10"" into lollipop-cts-releaselollipop-cts-release
| -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 120a1f1952e..513cc0fc51a 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.0_r10"> + android:versionName="5.0_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 788247378d7..9d707b52228 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.0_r10"; + public static final String CTS_BUILD_VERSION = "5.0_r9"; /** * {@inheritDoc} |