From ac88c3a0bf3b7f7e7a2afe7a9478e3f9c7096199 Mon Sep 17 00:00:00 2001
From: Chad Brubaker <cbrubaker@google.com>
Date: Mon, 17 Sep 2018 10:23:24 -0700
Subject: Ensure all android.process.media apps have usesCleartextTraffic=true

Change-Id: Ib90c0f75763d52744834887633f8f6503a916b61
Fixes: 113533479
Test: DownloadManager CTS
(cherry picked from commit 6cce476bc9d8fdf2edb161b878ae2a0aa6977265)
---
 ui/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/AndroidManifest.xml b/ui/AndroidManifest.xml
index fa795c9f..d08ec191 100644
--- a/ui/AndroidManifest.xml
+++ b/ui/AndroidManifest.xml
@@ -11,7 +11,8 @@
                  android:icon="@mipmap/ic_launcher_download"
                  android:hardwareAccelerated="true"
                  android:supportsRtl="true"
-                 android:requiredForAllUsers="true">
+                 android:requiredForAllUsers="true"
+                 android:usesCleartextTraffic="true">
 
         <activity
             android:name=".TrampolineActivity"
-- 
cgit v1.2.3


From 2ab5ac1cdb518f06b86a7777bffb54c81ca119e5 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 28 Sep 2018 22:24:22 -0700
Subject: Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id1fb3cadd075d0c20ad085fe4d4a29540b072716
---
 ui/res/values-ca/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/res/values-ca/strings.xml b/ui/res/values-ca/strings.xml
index 3892888a..b56b1a86 100644
--- a/ui/res/values-ca/strings.xml
+++ b/ui/res/values-ca/strings.xml
@@ -44,7 +44,7 @@
     <string name="cancel_running_download" msgid="5232704030969221112">"Cancel·la"</string>
     <string name="retry_download" msgid="7617100787922717912">"Torna-ho a provar"</string>
     <string name="start_now_download" msgid="1564642872809509681">"Comença ara"</string>
-    <string name="deselect_all" msgid="6348198946254776764">"Anul·la la selecció de tot"</string>
+    <string name="deselect_all" msgid="6348198946254776764">"Desselecciona-ho tot"</string>
     <string name="select_all" msgid="634074918366265804">"Selecciona-ho tot"</string>
     <string name="selected_count" msgid="2101564570019753277">"S\'han seleccionat <xliff:g id="NUMBER">%1$d</xliff:g> de <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="download_share_dialog" msgid="3355867339806448955">"Compart. mitjançant"</string>
-- 
cgit v1.2.3