commit a0ce80f2c7e71e4c1c49b9004d0457b672805956
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 16 19:24:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 16 19:24:18 2017 +0000
tree c2e961dcb9a2f9014bb2cc4047ce60903d5a5cd8
parent 6ad450940a020457a3f2637cbcd53b4f9a0ea754
parent 1709dd41847bed7b1a78026e3658ff3b7894f7ba

Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r25" into lollipop-mr1-cts-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 9e0e194..da065c0 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_r24">
+      android:versionName="5.1_r25">
 
     <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 1989e58..25780da 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_r24";
+    public static final String CTS_BUILD_VERSION = "5.1_r25";
 
     /**
      * {@inheritDoc}