diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-09-29 12:37:01 -0700 |
|---|---|---|
| committer | Brian Attwell <brianattwell@google.com> | 2014-09-29 12:37:01 -0700 |
| commit | 0eb86c4370dfbd5c780d5ae28c27bde0ddde7e9e (patch) | |
| tree | 05434612155cee1f38a4c0b2215519c3c621a135 /res/values-ja | |
| parent | df59d55631aaae0b290696cf7346b071053dc005 (diff) | |
| download | packages_apps_Contacts-0eb86c4370dfbd5c780d5ae28c27bde0ddde7e9e.tar.gz packages_apps_Contacts-0eb86c4370dfbd5c780d5ae28c27bde0ddde7e9e.tar.bz2 packages_apps_Contacts-0eb86c4370dfbd5c780d5ae28c27bde0ddde7e9e.zip | |
resolved conflicts for merge of c12e2385 to master
Change-Id: I7b7b82e47e64c18d672d65b116c6f3b332b54e5f
Diffstat (limited to 'res/values-ja')
| -rw-r--r-- | res/values-ja/strings.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 1e78793df..246cd3a55 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -255,5 +255,4 @@ <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"不在着信"</string> <string name="content_description_recent_call" msgid="6204048362763219585">"最近の通話。<xliff:g id="CALL_DETAILS">%s</xliff:g>。折り返し電話するにはタップしてください。"</string> <string name="message_from_you_prefix" msgid="7180706529908434482">"あなた: <xliff:g id="SMS_BODY">%s</xliff:g>"</string> - <string name="photo_file_provider_authority" msgid="7609339524372399628">"com.android.contacts.files"</string> </resources> |