summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-01-12 01:00:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-01-12 01:00:17 +0000
commit1183f12dc337cd603b07390c9354df201393c081 (patch)
treed7f887c8e83f43fc38cfd440ab6150a59e8a76f2
parent32492a9db9d998b5f40023cea0dc7b163469e917 (diff)
parentf46d0273dac65d2576b39670bb38b495bcbbadb4 (diff)
downloadcts-1183f12dc337cd603b07390c9354df201393c081.tar.gz
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r27" into lollipop-mr1-cts-dev
-rw-r--r--apps/CtsVerifier/AndroidManifest.xml2
-rw-r--r--tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 9207b6c92df..1470d4b8389 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_r26">
+ android:versionName="5.1_r27">
<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 915dc91899e..a395ff2b4e5 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_r26";
+ public static final String CTS_BUILD_VERSION = "5.1_r27";
/**
* {@inheritDoc}