diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-08-04 14:54:19 -0700 |
|---|---|---|
| committer | Eric Erfanian <erfanian@google.com> | 2017-08-07 15:21:54 +0000 |
| commit | 10ae593a59aa50963e1d3159747da2d65ca79bed (patch) | |
| tree | 7f98300ff2318f2eefb50d84ca2701a416590fb4 /java/com/android/contacts/common/res | |
| parent | e1a73952372a7ceee493863520e5046e6d979dc0 (diff) | |
| download | android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.gz android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.tar.bz2 android_packages_apps_Dialer-10ae593a59aa50963e1d3159747da2d65ca79bed.zip | |
This change brings Dialer oc-mr1-dev up to date with v11.1 RC06.
This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2
Test: make
master is already up to date and
Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9
Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
Diffstat (limited to 'java/com/android/contacts/common/res')
| -rw-r--r-- | java/com/android/contacts/common/res/values-zh-rHK/strings.xml | 2 | ||||
| -rw-r--r-- | java/com/android/contacts/common/res/values/colors.xml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml index 122d0febc..842ac873a 100644 --- a/java/com/android/contacts/common/res/values-zh-rHK/strings.xml +++ b/java/com/android/contacts/common/res/values-zh-rHK/strings.xml @@ -64,7 +64,7 @@ <string name="sms_mms" msgid="5187888900503248542">"傳送短訊至 MMS 電話號碼"</string> <string name="sms_by_shortcut" msgid="8005496406639963582">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (訊息)"</string> <string name="clearFrequentsConfirmation_title" msgid="7465690215775790243">"清除常用聯絡人？"</string> - <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件喜好設定。"</string> + <string name="clearFrequentsConfirmation" msgid="5750611450893399198">"您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件偏好設定。"</string> <string name="clearFrequentsProgress_title" msgid="2057183487226039454">"正在清除常用聯絡人…"</string> <string name="status_available" msgid="2648156525685472626">"在線"</string> <string name="status_away" msgid="2298688367552893953">"離開"</string> diff --git a/java/com/android/contacts/common/res/values/colors.xml b/java/com/android/contacts/common/res/values/colors.xml index 20b28c9d9..434d193c7 100644 --- a/java/com/android/contacts/common/res/values/colors.xml +++ b/java/com/android/contacts/common/res/values/colors.xml @@ -60,7 +60,6 @@ <color name="textColorIconOverlayShadow">#000</color> - <array name="letter_tile_colors"> <item>#DB4437</item> <item>#E91E63</item> |