summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorlinyuh <linyuh@google.com>2017-10-18 03:31:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-18 03:31:03 +0000
commit89ce7eb97e15be808bf79f052895692d54c838bb (patch)
treec462db1506ee7d2ab21f8a09e99e31d99b191bf6 /Android.mk
parentd603669595d571d09dc1a5abeb80456f52338958 (diff)
parent0c1bbbee967a4a35f4c57b41e21c467d06c85d17 (diff)
Merge changes Ida554313,Ie7187b02,I7a7c23b4 am: ef7a7eb0f1 am: 67bbb72fa5 am: 6fad8102be
am: 0c1bbbee96 Change-Id: Iae515564aca74dab088d2af78c65014c82a23ff8
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index e6d8325e8..f9b8004db 100644
--- a/Android.mk
+++ b/Android.mk
@@ -96,6 +96,7 @@ LOCAL_AAPT_FLAGS := \
com.android.dialer.app \
com.android.dialer.app.manifests.activities \
com.android.dialer.app.voicemail.error \
+ com.android.dialer.assisteddialing.ui \
com.android.dialer.backup \
com.android.dialer.binary.aosp.testing \
com.android.dialer.binary.google \
@@ -107,9 +108,9 @@ LOCAL_AAPT_FLAGS := \
com.android.dialer.calldetails \
com.android.dialer.calllog.database \
com.android.dialer.calllog.ui \
- com.android.dialer.calllog.ui.menu \
+ com.android.dialer.calllog.ui.menu \
com.android.dialer.calllogutils \
- com.android.dialer.clipboard \
+ com.android.dialer.clipboard \
com.android.dialer.common \
com.android.dialer.configprovider \
com.android.dialer.contactactions \