Don't allow file attachment from /data through GET_CONTENT.
am: eace8b43e8

Change-Id: Ib298494836deaee2ba1aa721daf6f496c2c1ee57
diff --git a/res/values-hi-sw600dp/strings.xml b/res/values-hi-sw600dp/strings.xml
index e17e2cc..d2bbed7 100644
--- a/res/values-hi-sw600dp/strings.xml
+++ b/res/values-hi-sw600dp/strings.xml
@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="5504248178750252553">"Cc/Bcc जोड़ें"</string>
     <string name="add_bcc_label" msgid="2464329024392383408">"Bcc जोड़ें"</string>
     <string name="menu_manage_folders" msgid="2575462565700103317">"फ़ोल्‍डर प्रबंधित करें"</string>
-    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"संदेश नोटिफिकेशन के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"संदेश सूचनाओं के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
 </resources>
diff --git a/res/values-ja-sw600dp/strings.xml b/res/values-ja-sw600dp/strings.xml
index 2e6e4ba..3277a81 100644
--- a/res/values-ja-sw600dp/strings.xml
+++ b/res/values-ja-sw600dp/strings.xml
@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="5504248178750252553">"Cc/Bccを追加"</string>
     <string name="add_bcc_label" msgid="2464329024392383408">"Bccを追加"</string>
     <string name="menu_manage_folders" msgid="2575462565700103317">"フォルダを管理"</string>
-    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"メッセージ通知への返信時の既定値として使用する"</string>
+    <string name="preferences_default_reply_all_summary" msgid="6407854387225415499">"メッセージ通知への返信時のデフォルトとして使用する"</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index fcf15ae..0e2ec78 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -56,7 +56,7 @@
     <string name="mark_read" msgid="579388143288052493">"ဖတ်ပြီး မှတ်သား"</string>
     <string name="mark_unread" msgid="6245060538061533191">"မဖတ်ရသေးဟု မှတ်သားရန်"</string>
     <string name="toggle_read_unread" msgid="1006469736520919028">"ဖတ်ခဲ့ မဖတ်ခဲ့ကို ကစားကြည့်ရန်"</string>
-    <string name="mute" msgid="9164839998562321569">"အသံတိတ်ရန်"</string>
+    <string name="mute" msgid="9164839998562321569">"အသံတိတ်"</string>
     <string name="add_star" msgid="3275117671153616270">"စတား ထည့်ရန်"</string>
     <string name="remove_star" msgid="9126690774161840733">"စတားကို ဖယ်ရှားရန်"</string>
     <string name="remove_folder" msgid="2379905457788576297">"<xliff:g id="FOLDERNAME">%1$s</xliff:g> မှ ဖယ်ရှားရန်"</string>
@@ -355,7 +355,7 @@
     <item quantity="other" msgid="3531683811183204615">"စာ အသစ် <xliff:g id="COUNT">%1$d</xliff:g> ခု"</item>
   </plurals>
     <string name="single_new_message_notification_title" msgid="7954710563222504868">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
-    <string name="silent_ringtone" msgid="1570794756474381886">"အသံတိတ်ရန်"</string>
+    <string name="silent_ringtone" msgid="1570794756474381886">"အသံတိတ်"</string>
     <string name="preference_removal_action_title" msgid="3128186577060329884">"ပုံသေ လုပ်ဆောင်ချက်"</string>
   <string-array name="prefEntries_removal_action">
     <item msgid="7381624742404593351">"မော်ကွန်းတင်ရန်"</item>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 02a43b2..7a821a9 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -42,7 +42,7 @@
     <string name="select_attachment_type" msgid="353236686616663062">"संलग्नकको प्रकार छनौट गर्नुहोस्"</string>
     <string name="too_large_to_attach_single" msgid="2669897137966512530">"<xliff:g id="MAXSIZE">%1$s</xliff:g> मा फाइल एट्याच गर्न सकिंदैन।"</string>
     <string name="too_large_to_attach_multiple" msgid="1620163295709036343">"एक वा बढी फाइलहरुलाई एट्याच गरिएको छैन। <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमित गर्नुहोस्।"</string>
-    <string name="too_large_to_attach_additional" msgid="4964155563465970480">"फाईल संलग्न भएको छैन। <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमा पुग्यो।"</string>
+    <string name="too_large_to_attach_additional" msgid="4964155563465970480">"फाइल संलग्न भएको छैन। <xliff:g id="MAXSIZE">%1$s</xliff:g> सीमा पुग्यो।"</string>
     <string name="generic_attachment_problem" msgid="4683974765387240723">"फाइल संलग्न गर्न सकेन।"</string>
     <string name="attachment_permission_denied" msgid="2274397783497640486">"संलग्नकको लागि अनुमति अस्वीकृत।"</string>
     <string name="recipient_needed" msgid="319816879398937214">"कम्तिमा पनि एउटा प्राप्तकर्ता थप्नुहोस्।"</string>
@@ -92,7 +92,7 @@
     <string name="bytes" msgid="651011686747499628">"<xliff:g id="COUNT">%s</xliff:g> B"</string>
     <string name="kilobytes" msgid="1523463964465770347">"<xliff:g id="COUNT">%s</xliff:g> KB"</string>
     <string name="megabytes" msgid="4309397368708773323">"<xliff:g id="COUNT">%s</xliff:g> MB"</string>
-    <string name="attachment_image" msgid="6375306026208274564">"तस्बिर"</string>
+    <string name="attachment_image" msgid="6375306026208274564">"तस्वीर"</string>
     <string name="attachment_video" msgid="7119476472603939848">"भिडियो"</string>
     <string name="attachment_audio" msgid="7097658089301809284">"अडियो"</string>
     <string name="attachment_text" msgid="3485853714965922173">"पाठ"</string>
@@ -120,7 +120,7 @@
     <string name="contextmenu_openlink" msgid="6952228183947135362">"ब्राउजरमा खोल्नुहोस्"</string>
     <string name="contextmenu_copy" msgid="2584243784216385180">"प्रतिलिपि गर्नुहोस्"</string>
     <string name="contextmenu_copylink" msgid="8659897702269320063">"लिङ्क URL प्रतिलिपि गर्नुहोस्"</string>
-    <string name="contextmenu_view_image" msgid="1031172763893491000">"तस्बिर हेर्नुहोस्"</string>
+    <string name="contextmenu_view_image" msgid="1031172763893491000">"तस्वीर हेर्नुहोस्"</string>
     <string name="contextmenu_dial_dot" msgid="8881095692316726628">"डायल गर्नुहोस्..."</string>
     <string name="contextmenu_sms_dot" msgid="5319737001771622657">"SMS..."</string>
     <string name="contextmenu_add_contact" msgid="2310064151427072475">"सम्पर्क थप्नुहोस्"</string>
@@ -301,7 +301,7 @@
     <string name="manual_sync" msgid="2271479734895537848">"अहिले सिङ्क गर्नुहोस्"</string>
     <string name="change_sync_settings" msgid="3615852118397055361">"सिङ्क सेटिङ्स परिवर्तन गर्नुहोस्"</string>
     <string name="photo_load_failed" msgid="577471721679146999">"तस्बिरलाई लोड गर्न सकेन"</string>
-    <string name="cant_move_or_change_labels" msgid="4155490583610926755">"सार्न सकिएन किनकि छनोट भएका भित्र एक भन्दा बढी खाताहरु छन्।"</string>
+    <string name="cant_move_or_change_labels" msgid="4155490583610926755">"सार्न सकिएन किनकि छनोट भएका भित्र एक भन्दा बढी खाताहरू छन्।"</string>
     <string name="multiple_new_message_notification_item" msgid="1386588046275174918"><b>"<xliff:g id="SENDER">%1$s</xliff:g>"</b>"  <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="single_new_message_notification_big_text" msgid="2170154732664242904">"<xliff:g id="SUBJECT">%1$s</xliff:g>\n<xliff:g id="SNIPPET">%2$s</xliff:g>"</string>
     <string name="ignore_spam_warning" msgid="8760314545535838430">"बेवास्ता गर्नुहोस्, म यो सन्देशलाई विश्वास गर्दछु"</string>
@@ -330,8 +330,8 @@
     <item msgid="880913657385630195">"तपाईंले मेटाए पछि कुराकानी सूची देखाउनुहोस्"</item>
   </string-array>
     <string name="prefDialogTitle_autoAdvance" msgid="5459235590885640678">"निम्नमा उन्नत"</string>
-    <string name="clear_display_images_whitelist_title" msgid="2012677202404471778">"तस्बिर अनुमोदनहरू हटाउनुहोस्"</string>
-    <string name="clear_display_images_whitelist_dialog_title" msgid="1942692501166848471">"तस्बिर अनुमोदनहरू हटाउनु हुन्छ?"</string>
+    <string name="clear_display_images_whitelist_title" msgid="2012677202404471778">"तस्वीर अनुमोदनहरू हटाउनुहोस्"</string>
+    <string name="clear_display_images_whitelist_dialog_title" msgid="1942692501166848471">"तस्वीर अनुमोदनहरू हटाउनु हुन्छ?"</string>
     <string name="clear_display_images_whitelist_dialog_message" msgid="3952553078559373729">"तपाईँले पहिले अनुमति दिनुभएका प्रेषकहरूबाट इनलाइन चित्रहरू प्रदर्शन गर्न रोक्नुहोस्।"</string>
     <string name="sender_whitelist_cleared" msgid="2490984995927904030">"तस्बिरहरू स्वचालित रूपमा देखाइने छैन।"</string>
     <string name="preferences_signature_title" msgid="2318034745474929902">"हस्ताक्षर"</string>
@@ -401,7 +401,7 @@
     <string name="print_all" msgid="4011022762279519941">"सबै मुद्रण गरिएको छ"</string>
   <plurals name="num_messages">
     <item quantity="one" msgid="8071234386915191851">"<xliff:g id="COUNT">%1$d</xliff:g> सन्देश"</item>
-    <item quantity="other" msgid="962415099931188360">"<xliff:g id="COUNT">%1$d</xliff:g> सन्देशहरु"</item>
+    <item quantity="other" msgid="962415099931188360">"<xliff:g id="COUNT">%1$d</xliff:g> सन्देशहरू"</item>
   </plurals>
     <string name="date_message_received_print" msgid="4168417403884350040">"<xliff:g id="DAY_AND_DATE">%1$s</xliff:g> यस <xliff:g id="TIME">%2$s</xliff:g>मा"</string>
     <string name="draft_to_heading" msgid="7370121943946205024">"निम्नलाई ड्राफ्ट:"</string>