Merge branch 'master' into StudioProjectCompat

Another merge commit to track master changes
2026-04-23 00:00:09 +08:00 · 2017-09-14 11:45:57 -07:00
parent 0d98e09fb1 53210710ba
commit 7d282426c4
76 changed files with 3565 additions and 917 deletions
@@ -21,6 +21,9 @@
 buildscript {
    repositories {
        jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:2.3.0'
@@ -33,6 +36,9 @@ buildscript {
 allprojects {
    repositories {
        jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
    }

    //This replaces project.properties