Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Already up-to-date.
Auto-merging src/com/android/services/telephony/TelephonyConnection.java
Auto-merging src/com/android/server/telecom/TelephonyUtil.java
Merge made by the 'recursive' strategy.
 res/values/qtistrings.xml                                     |  3 +++
 src/com/android/contacts/common/list/ContactListItemView.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
Merge made by the 'recursive' strategy.
Removing res/drawable/wifi_calling.xml
Removing res/drawable/volte_voice.xml
Removing res/drawable/volte_video.xml
 Android.mk                                                        |   2 +-
 AndroidManifest.xml                                               |   3 +
 res/drawable-xxxhdpi/ic_enrich_call_black_24dp.png                | Bin 0 -> 2736 bytes
 res/layout/expanding_entry_card_item.xml                          |  16 +++++-
 src/com/android/contacts/detail/EnrichDisplayUtils.java           | 212 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/android/contacts/quickcontact/ExpandingEntryCardView.java |  76 ++++++++++++++++++++++++-
 src/com/android/contacts/quickcontact/QuickContactActivity.java   | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/com/android/contacts/widget/CallTypeIconsView.java            |  12 ++++
 8 files changed, 475 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable-xxxhdpi/ic_enrich_call_black_24dp.png
 create mode 100644 src/com/android/contacts/detail/EnrichDisplayUtils.java
Auto-merging stack/l2cap/l2c_csm.c
Auto-merging bta/dm/bta_dm_act.c
Merge made by the 'recursive' strategy.
Merge made by the 'recursive' strategy.
 src/com/android/phone/settings/AccessibilitySettingsFragment.java | 9 +++++++++
 src/com/android/phone/settings/fdn/FdnSetting.java                | 8 +++++++-
 src/com/android/services/telephony/TelephonyConnection.java       | 2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
 Android.mk                                                    |   2 +-
 AndroidManifest.xml                                           |   4 +
 src/com/android/server/telecom/CallIntentProcessor.java       |  15 +++
 src/com/android/server/telecom/CallLogManager.java            |  17 +--
 src/com/android/server/telecom/CallsManager.java              |  10 ++
 src/com/android/server/telecom/RcsCallHandler.java            | 478 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/android/server/telecom/TelephonyUtil.java             |   4 -
 src/com/android/server/telecom/ui/MissedCallNotifierImpl.java |   3 +-
 tests/Android.mk                                              |   3 +-
 9 files changed, 521 insertions(+), 15 deletions(-)
 create mode 100644 src/com/android/server/telecom/RcsCallHandler.java
Merge made by the 'recursive' strategy.
Merge made by the 'recursive' strategy.
 libc/zoneinfo/tzdata | Bin 497225 -> 495626 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 InCallUI/src/com/android/incallui/InCallActivity.java         |  7 ++++++
 res/drawable/vilte.xml                                        | 41 ++++++++++++++++++++++++++++++++
 res/drawable/viwifi.xml                                       | 41 ++++++++++++++++++++++++++++++++
 res/drawable/volte.xml                                        | 41 ++++++++++++++++++++++++++++++++
 res/drawable/volte_video.xml                                  | 36 ----------------------------
 res/drawable/volte_voice.xml                                  | 36 ----------------------------
 res/drawable/vowifi.xml                                       | 41 ++++++++++++++++++++++++++++++++
 res/drawable/wifi_calling.xml                                 | 36 ----------------------------
 res/values/qtistrings.xml                                     |  3 +++
 src/com/android/dialer/calllog/CallDetailHistoryAdapter.java  |  6 ++---
 src/com/android/dialer/calllog/CallLogAdapter.java            |  2 ++
 src/com/android/dialer/calllog/CallLogListItemViewHolder.java | 61 ++++++++++++++++++++++++++++++++++++++++-------
 src/com/android/dialer/calllog/CallTypeIconsView.java         | 94 +++++++++++++++++++++++++++++++++++++++----------------------------------
 src/com/android/dialer/settings/DialerSettingsActivity.java   | 69 +++++++++++++++++++++++++++++++++--------------------
 src/com/android/dialer/settings/SoundSettingsFragment.java    | 26 ++++++++++++++------
 src/com/android/dialer/util/AppCompatConstants.java           |  6 ++---
 16 files changed, 346 insertions(+), 200 deletions(-)
 create mode 100644 res/drawable/vilte.xml
 create mode 100644 res/drawable/viwifi.xml
 create mode 100644 res/drawable/volte.xml
 delete mode 100644 res/drawable/volte_video.xml
 delete mode 100644 res/drawable/volte_voice.xml
 create mode 100644 res/drawable/vowifi.xml
 delete mode 100644 res/drawable/wifi_calling.xml
Merge made by the 'recursive' strategy.
 bta/av/bta_av_main.c              |  7 +++++--
 bta/dm/bta_dm_act.c               |  2 +-
 bta/hh/bta_hh_le.c                | 50 --------------------------------------------------
 device/include/interop.h          |  5 +++++
 device/include/interop_database.h |  2 ++
 device/src/interop.c              |  1 +
 stack/gatt/gatt_db.c              |  3 ++-
 stack/l2cap/l2c_ble.c             |  3 +++
 stack/l2cap/l2c_csm.c             |  3 ++-
 9 files changed, 21 insertions(+), 55 deletions(-)
Merge made by the 'recursive' strategy.
 res/xml/wireless_settings.xml                           |  5 +++++
 src/com/android/settings/WirelessSettings.java          | 13 +++++++++++++
 src/com/android/settings/wifi/WifiConfigController.java | 20 ++++++++++++++++----
 3 files changed, 34 insertions(+), 4 deletions(-)