Merge branch 'master' into version-3.1.1-dev

Change-Id: I16434325d6c07953f23a7d67a3d66f10bcea7eab

Author: samtstern

.opensource/project.json

@@ -0,0 +1,40 @@
+{
+    "name": "FirebaseUI for Android",
+    "parent": "firebaseui",
+    "type": "library",
+  
+    "platforms": [
+      "Android"
+    ],
+  
+    "content": "README.md",
+  
+    // These are relative paths in the same repo,
+    // each of these paths must have a .opensource/project.json
+    "subprojects": [],
+
+    // Other markdown pages that should be rendered nicely
+    "pages" : [
+        "auth/README.md",
+        "database/README.md",
+        "storage/README.md",
+        "firestore/README.md",
+        "docs/upgrade-to-2.0.md",
+        "docs/upgrade-to-3.0.md"
+    ],
+  
+    // Related projects on Github, in the format $owner/$repo[/$subproject]
+    // where subproject is optional.
+    "related": [
+      "firebase/firebaseui-ios",
+      "firebase/firebaseui-web"
+    ],
+  
+    "tags": [
+      "firebase-auth",
+      "firebase-database",
+      "firebase-firestore",
+      "firebase-storage"
+    ]
+  }
+  

.travis.yml

@@ -19,6 +19,9 @@ android:
     # https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
     - tools
     - tools
+    - platform-tools
+    - android-26
+    - build-tools-26.0.1
 before_script:
   - mv library/google-services.json app/google-services.json
   - echo y | ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;26.0.2" "platforms;android-26"