From fac56be49919aa3761c4a47b5edc53ca5472c31e Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 24 Oct 2018 16:57:19 -0700
Subject: [PATCH] Fix the build by listing google repo first.

Apparently jcenter() is lame and it broke our build. Listing the google
repo first fixes everything.
---
 build.gradle              | 13 +++++--------
 res/values-te/strings.xml |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6d1018a5b6..bb0ab6f37d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,14 +2,14 @@ import java.security.MessageDigest
 
 buildscript {
     repositories {
-        maven {
-            url "https://repo1.maven.org/maven2"
-            jcenter()
-        }
         maven {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        maven {
+            url "https://repo1.maven.org/maven2"
+            jcenter()
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
@@ -48,12 +48,9 @@ repositories {
     maven { // textdrawable
         url 'https://dl.bintray.com/amulyakhare/maven'
     }
+    google()
     jcenter()
     mavenLocal()
-    maven {
-        url 'https://maven.google.com/'
-        name 'Google'
-    }
 }
 
 dependencies {
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index d43150f0f0..57d1f24617 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -713,7 +713,7 @@
   <string name="import_fragment__import_system_sms_database">వ్యవస్థ ఎస్సెమ్మెస్ డేటాబేస్ దిగుమతి</string>
   <string name="import_fragment__import_the_database_from_the_default_system">డిఫాల్ట్ వ్యవస్థ మెసెంజర్ అనువర్తనం నుండి డేటాబేస్ దిగుమతి</string>
   <string name="import_fragment__import_plaintext_backup">సాధారణ అక్షరాల బ్యాకప్ దిగుమతి </string>
-  <string name="import_fragment__import_a_plaintext_backup_file">సాదా బ్యాకప్ ఫైల్ దిగుమతి. 'ఎస్ఎంఎస్ బ్యాకప్ &amp; amp అనుకూలంగా; పునరుద్ధరించు. '</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">సాదా బ్యాకప్ ఫైల్ దిగుమతి. \'ఎస్ఎంఎస్ బ్యాకప్ &amp; amp అనుకూలంగా; పునరుద్ధరించు. \'</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">పూర్తి సంభాషణ చూడండి</string>
   <!--media_overview_activity-->