OSDN Git Service

Merge "Consolidate WiFi Calling string resources" into nyc-dev
authorPavel Zhamaitsiak <pavelz@google.com>
Thu, 14 Apr 2016 17:16:40 +0000 (17:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Apr 2016 17:16:41 +0000 (17:16 +0000)
commit070b73a46d7344b8a1c771ab537c30c08d078051
tree7c202c5057c0e31cda8d3f498690c625f5188159
parent5ce4e2e78f3f4e1c39423a79ad1787e05b961e14
parent7b7c4fc2fe146d32479ca9bb606da663cd76651c
Merge "Consolidate WiFi Calling string resources" into nyc-dev
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
telephony/java/android/telephony/CarrierConfigManager.java