commit 07e2bb1c9e865ff8f12e30bd88201516407badae
author Bill Yi <byi@google.com> Wed Jul 26 21:49:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jul 26 21:49:25 2017 +0000
tree 382c86b36aae319ec56b92ec38862e3aa623f961
parent 68038172793ee0e2ab3e2e56ddfbeb82879d1f58
parent 04d29c1e089afb1ac17beeeb2a16bdbef8b4fcb4

Import translations. DO NOT MERGE am: 5fc22b92d2  -s ours
am: 04d29c1e08  -s ours

Change-Id: Id938c1a240fbcddd17c6b3c48fc71f9ee8ae9b1d

Android.mk

diff --git a/Android.mk b/Android.mk
index 49cb3e4..fd38fd3 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 := \