From 0eb86c4370dfbd5c780d5ae28c27bde0ddde7e9e Mon Sep 17 00:00:00 2001
From: Brian Attwell <brianattwell@google.com>
Date: Mon, 29 Sep 2014 12:37:01 -0700
Subject: resolved conflicts for merge of c12e2385 to master

Change-Id: I7b7b82e47e64c18d672d65b116c6f3b332b54e5f
---
 res/values-te-rIN/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/values-te-rIN/strings.xml')

diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index be7721a8e..3253d6489 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/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>
-- 
cgit v1.2.3