commit 4b830c0716985ab29910f076548dabc1d74200bb
author Brian Muramatsu <btmura@google.com> Mon Jun 04 15:59:38 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 04 15:59:38 2012 -0700
tree 4a9e9125fd1e561b719ddf4308179adf544ff3ee
parent b5b2307fc7eb12c13209c929fac86b23252b78dc
parent f6328f63e3fa755759c327f1e857a4adf83321be

Merge "DO NOT MERGE Set CTS and CtsVerifier to 4.1_r1" into jb-dev

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 4b47f65..bacf4bd 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="1"
-      android:versionName="1337">
+      android:versionName="4.1_r1">
 
     <!-- Using 10 for more complete NFC support... -->
     <uses-sdk android:minSdkVersion="10"></uses-sdk>

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 f53507d..5ad7e25 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 = "4.0_r1";
+    public static final String CTS_BUILD_VERSION = "4.1_r1";
 
     /**
      * {@inheritDoc}