commit d1d6cea15ea80e86f562b9174ea5bfa39d30fa97
author keunyoung <keunyoung@google.com> Mon Apr 01 10:26:23 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 01 10:26:23 2013 -0700
tree 75d1c4f1915e8570638728a2b9dde27d3678eba1
parent 1b005d5b6a8bff083aef16494bac529b52a8c395
parent da7c58ec790c867e2f7bf40af4c05438eba89d4a

am da7c58ec: am 5158006b: am d4fa235e: Merge "version up to R4" into jb-mr1.1-dev

* commit 'da7c58ec790c867e2f7bf40af4c05438eba89d4a':
  version up to R4

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 942f1b1..e91595b 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.2_r3";
+    public static final String CTS_BUILD_VERSION = "4.2_r4";
 
     /**
      * {@inheritDoc}