commit 8c2a6b742ef85d4fd32ce5abff21483262bea2b1
author Brian Muramatsu <btmura@android.com> Fri Sep 17 14:03:45 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 17 14:03:45 2010 -0700
tree d2d685e841438776f9fcc6dc6d97aff05f226ebc
parent 0615bf5c800136aa6092b1c98418b1100b19ad31
parent e9937f907133c2411ff5350f050b4afd15d84080

am e9937f90: (-s ours) Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo

Merge commit 'e9937f907133c2411ff5350f050b4afd15d84080' into froyo

* commit 'e9937f907133c2411ff5350f050b4afd15d84080':
  DO NOT MERGE Froyo CTS Version Increment to 2.2_r3

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 4664a3e..5f07e00 100644
--- a/tools/host/src/com/android/cts/Version.java
+++ b/tools/host/src/com/android/cts/Version.java
@@ -18,7 +18,7 @@
 
 public class Version {
     // The CTS version string
-    private static final String version = "2.2_r3";
+    private static final String version = "2.2_r2";
 
     private Version() {
         // no instances allowed