diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-18 02:50:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-18 02:50:55 +0000 |
| commit | ef7a7eb0f103d41df55385267ac52dc3dcf603cb (patch) | |
| tree | 8bb6b163a88cf321073913c2b0b7dad5ecbd854e /Android.mk | |
| parent | c2590357cf857e714f875f2a7c222d1bd128c2c5 (diff) | |
| parent | 6f78d935ff64f178e9fe8891082c18578d4e4b74 (diff) | |
Merge changes Ida554313,Ie7187b02,I7a7c23b4
* changes:
Stop showing partially matched numbers that are not global phone numbers.
Display Voicemail Contact Name and Photo in Voicemail Fragment.
Add temporary assisted dialing setting to Dialer.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index bf44ffa13..82f745f61 100644 --- a/Android.mk +++ b/Android.mk @@ -91,6 +91,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 \ @@ -102,9 +103,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 \ |