commit 0e8212053b47f73f561d293922a24913354fcfaa
author Daniel Xie <dxie@google.com> Tue Oct 27 23:08:33 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 27 23:08:33 2015 +0000
tree b7b8a97e0681214ac8280edfd9d31d9f71fa6d04
parent 98990c5fe4ab80593da3721566dd10c45df49800
parent 88c326c0c9a860258114c8210e9696b4ec50eaa0

Merge "DO NOT MERGE ANYWHERE: bumping CTS 5.1 to R4" into lollipop-mr1-cts-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index b525cc4..cec1cca 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_r3">
+      android:versionName="5.1_r4">
 
     <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21"/>
 

tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

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 d0d3d56..0acb43b 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 @@
     @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_r3";
+    public static final String CTS_BUILD_VERSION = "5.1_r4";
 
     /**
      * {@inheritDoc}