commit c04c15198390b96b67071121c21260e40e3d0ad9
author Keun young Park <keunyoung@google.com> Wed Nov 28 17:12:24 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 28 17:12:24 2012 -0800
tree 2c03c4826e6f6b8d31d1e9e7f9db905be7e39f39
parent 28e3b1c1ce037271695187767f9614732e435b2d
parent ee5352a682bd64358a1ac40603f3486cfe410841

am ee5352a6: Merge "add 4.2.1 to version list" into jb-mr1-dev

* commit 'ee5352a682bd64358a1ac40603f3486cfe410841':
  add 4.2.1 to version list

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 9876694..0167364 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -29,7 +29,7 @@
 
     private static final String LOG_TAG = "BuildVersionTest";
     private static final Set<String> EXPECTED_RELEASES =
-            new HashSet<String>(Arrays.asList("4.2"));
+            new HashSet<String>(Arrays.asList("4.2", "4.2.1"));
     private static final int EXPECTED_SDK = 17;
 
     @SuppressWarnings("deprecation")