commit 6a750e815cb5f303a2716282d87b2c12d5d1526a
author Brian Muramatsu <btmura@android.com> Wed Oct 13 13:21:12 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 13 13:21:12 2010 -0700
tree dc1273587ada0c91dac9f7cd920aeea07e97c0c2
parent f35266c4b07378d579701bc2cddea3da4c719eb6
parent 69c17f6751c425d0b65de3ad6a5ae7ba597615f2

am 69c17f67: am efc12969: Merge "CTS Test: expected release version updated." into froyo

Merge commit '69c17f6751c425d0b65de3ad6a5ae7ba597615f2' into gingerbread

* commit '69c17f6751c425d0b65de3ad6a5ae7ba597615f2':
  CTS Test: expected release version updated.

tests/tests/os/src/android/os/cts/BuildVersionTest.java

diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
index e353be9..61e1837 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -27,7 +27,7 @@
 public class BuildVersionTest extends TestCase {
 
     private static final String LOG_TAG = "BuildVersionTest";
-    private static final String EXPECTED_RELEASE = "2.2";
+    private static final String EXPECTED_RELEASE = "2.2.1";
     private static final String EXPECTED_SDK = "8";
 
     public void testReleaseVersion() {