Update CTS version numbers to 2.2.

Change-Id: I7105f54348364e45b08deee0d8971d62a94dd080
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
index f8ef1f9..e353be9 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -27,8 +27,8 @@
 public class BuildVersionTest extends TestCase {
 
     private static final String LOG_TAG = "BuildVersionTest";
-    private static final String EXPECTED_RELEASE = "2.1-update1";
-    private static final String EXPECTED_SDK = "7";
+    private static final String EXPECTED_RELEASE = "2.2";
+    private static final String EXPECTED_SDK = "8";
 
     public void testReleaseVersion() {
         // Applications may rely on the exact release version
diff --git a/tools/host/src/com/android/cts/Version.java b/tools/host/src/com/android/cts/Version.java
index b3f6766..fead909 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.1_r1";
+    private static final String version = "2.2_r1";
     
     private Version() {
         // no instances allowed