Merge commit 'remotes/goog/eclair' into eclair-release

core/product_config.mk

@@ -193,6 +193,12 @@ ifneq (,$(extra_locales))
   extra_locales :=
 endif
 
+# Default to medium-density assets.
+# (Can be overridden in the device config, e.g.: PRODUCT_LOCALES += hdpi)
+PRODUCT_LOCALES := $(strip \
+	$(PRODUCT_LOCALES) \
+	$(if $(filter %dpi,$(PRODUCT_LOCALES)),,mdpi))
+
 # Assemble the list of options.
 PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES)