diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-09-25 17:59:42 -0700 |
|---|---|---|
| committer | Brian Attwell <brianattwell@google.com> | 2014-09-25 17:59:42 -0700 |
| commit | f975e03d8f24cc93112bb156719847753b36a3b0 (patch) | |
| tree | 13517f4077cb0deeab8eb6850dc5e2878ec3648d /res/values-lt | |
| parent | 0a439bb00c4b6c2a58c3fac5ac1b5c918bb42b50 (diff) | |
| parent | d30c3c2d7526f011abf28e752b45e8aee0a23dd3 (diff) | |
| download | packages_apps_Contacts-f975e03d8f24cc93112bb156719847753b36a3b0.tar.gz packages_apps_Contacts-f975e03d8f24cc93112bb156719847753b36a3b0.tar.bz2 packages_apps_Contacts-f975e03d8f24cc93112bb156719847753b36a3b0.zip | |
resolved conflicts for merge of d30c3c2d to master
Change-Id: I395073abadc88f4224899d1b8c1453d7bc9e734c
Diffstat (limited to 'res/values-lt')
| -rw-r--r-- | res/values-lt/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 2705a013d..428df7996 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -255,5 +255,8 @@ <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"praleistieji"</string> <string name="content_description_recent_call" msgid="6204048362763219585">"Naujausias skambutis. <xliff:g id="CALL_DETAILS">%s</xliff:g>. Spustelėkite, atskambintumėte"</string> <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string> +<<<<<<< HEAD <string name="photo_file_provider_authority" msgid="7609339524372399628">"com.android.contacts.files"</string> +======= +>>>>>>> d30c3c2d </resources> |