commit 10cac527706816cfd65594076b60e3133a2faad1
author Guru Nagarajan <gurunagarajan@google.com> Mon Mar 04 12:11:16 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 04 12:11:16 2013 -0800
tree ddf052067aeed96878762f1b46bedacc9e899703
parent 81e0de2968c3dbab4b1b682173da7b203a571cc8
parent 5404ff9e3323eccddab035a2776d76112e2655ee

am 5404ff9e: DO NOT MERGE Version fixes 	modified:   apps/CtsVerifier/AndroidManifest.xml 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

* commit '5404ff9e3323eccddab035a2776d76112e2655ee':
  DO NOT MERGE Version fixes 	modified:   apps/CtsVerifier/AndroidManifest.xml 	modified:   tools/tradefed-host/src/com/android/cts/tradefed/build/CtsBuildProvider.java

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