diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-26 09:25:59 -0700 |
|---|---|---|
| committer | Baligh Uddin <baligh@google.com> | 2014-09-26 09:25:59 -0700 |
| commit | df59d55631aaae0b290696cf7346b071053dc005 (patch) | |
| tree | 080ef4c7a6e6694716ba97e9569f3204925d3d8b /res/values-tl | |
| parent | 7a29738a3cf73e4f536c8e41857a6ebc6a3662cc (diff) | |
| download | android_packages_apps_Contacts-df59d55631aaae0b290696cf7346b071053dc005.tar.gz android_packages_apps_Contacts-df59d55631aaae0b290696cf7346b071053dc005.tar.bz2 android_packages_apps_Contacts-df59d55631aaae0b290696cf7346b071053dc005.zip | |
Fix Build - remove merge conflict markers.
Change-Id: I8de2abce4b43d0c981216079d267e1f61c0f805b
Diffstat (limited to 'res/values-tl')
| -rw-r--r-- | res/values-tl/strings.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 6442593a8..9efea2169 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -255,8 +255,5 @@ <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"hindi nasagot"</string> <string name="content_description_recent_call" msgid="6204048362763219585">"kamakailang tawag. <xliff:g id="CALL_DETAILS">%s</xliff:g>. i-click upang tumawag"</string> <string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <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> |