commit 6eb4e2305c23fb1036db4926786846d49475f1eb
author Chiao Cheng <chiaocheng@google.com> Thu Nov 29 14:27:51 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 29 14:27:51 2012 -0800
tree ea221d58971a7b73558801ff179a389d09576f0d
parent 88afb4413be728c1a454d5556d734c1634c908e7
parent 9d8108fe72b4783d68c08f3ce86cd7bb203063f5

am 9d8108fe: am 226fae4d: Merge "Cherry picking BitmapUtilTest fix." into jb-mr1.1-dev

* commit '9d8108fe72b4783d68c08f3ce86cd7bb203063f5':
  Cherry picking BitmapUtilTest fix.

tests/src/com/android/contacts/util/BitmapUtilTests.java

diff --git a/tests/src/com/android/contacts/util/BitmapUtilTests.java b/tests/src/com/android/contacts/util/BitmapUtilTests.java
index 554fc97..8180b7c 100644
--- a/tests/src/com/android/contacts/util/BitmapUtilTests.java
+++ b/tests/src/com/android/contacts/util/BitmapUtilTests.java
@@ -60,7 +60,7 @@
     }
 
     public void testFindOptimalSampleSizeSmaller3() throws Exception {
-        assertEquals(2, BitmapUtil.findOptimalSampleSize(512, 129));
+        assertEquals(4, BitmapUtil.findOptimalSampleSize(512, 129));
     }
 
     public void testFindOptimalSampleSizeSmaller4() throws Exception {