commit 40198166bfcefffdcb67828a4cc11cc635dddca8
author Brian Muramatsu <btmura@android.com> Thu Aug 12 13:05:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 12 13:05:23 2010 -0700
tree d75576e82e3edeeb2441a9eaed6251f0a1aae531
parent f2940a9c67cdbfe84b066ca012df5e35a00531bd
parent 28179d627c2ddf62cbd68c47822163b80ab12277

am 28179d62: Merge "Some Assorted WebKit Test Fixes" into froyo

Merge commit '28179d627c2ddf62cbd68c47822163b80ab12277' into froyo

* commit '28179d627c2ddf62cbd68c47822163b80ab12277':
  Some Assorted WebKit Test Fixes

tools/host/src/com/android/cts/Version.java

diff --git a/tools/host/src/com/android/cts/Version.java b/tools/host/src/com/android/cts/Version.java
index 5f07e00..fead909 100644
--- a/tools/host/src/com/android/cts/Version.java
+++ b/tools/host/src/com/android/cts/Version.java
@@ -18,12 +18,12 @@
 
 public class Version {
     // The CTS version string
-    private static final String version = "2.2_r2";
-
+    private static final String version = "2.2_r1";
+    
     private Version() {
         // no instances allowed
     }
-
+    
     public static String asString() {
         return version;
     }