am e5a6d16f: Merge change 25785 into eclair

Merge commit 'e5a6d16f26543061a0fc815ba90644a44995e025' into eclair-plus-aosp

* commit 'e5a6d16f26543061a0fc815ba90644a44995e025':
  Fix http://b/2126318 (density test fails due to wrong-size asset stripping)
diff --git a/tests/AndroidTests/Android.mk b/tests/AndroidTests/Android.mk
index f5e49d7..ced796a 100644
--- a/tests/AndroidTests/Android.mk
+++ b/tests/AndroidTests/Android.mk
@@ -8,7 +8,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := googlelogin-client
 
 # Resource unit tests use a private locale
-LOCAL_AAPT_FLAGS = -c xx_YY -c cs
+LOCAL_AAPT_FLAGS = -c xx_YY -c cs -c 160dpi -c 32dpi -c 240dpi
 
 LOCAL_SRC_FILES := \
 	$(call all-subdir-java-files) \