Merge "Revert "Tweak app makefile with extra resources"" into oc-dev
am: fb63fc2c6b

Change-Id: I88573a3020e6394f819245dea10ad741b6ccb81a
diff --git a/Android.mk b/Android.mk
index f46e4d8..1388b01 100644
--- a/Android.mk
+++ b/Android.mk
@@ -41,6 +41,10 @@
 	$(BASE_DIR)/incallui/maps/impl/MapsModule.java \
 	$(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java
 
+# Exclude testing only class, not used anywhere here
+EXCLUDE_FILES += \
+	$(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java
+
 # All Dialers resources.
 # find . -type d -name "res" | uniq | sort
 RES_DIRS := \