Merge branch 'master' into develop

.travis.yml

@@ -8,16 +8,9 @@ jdk: oraclejdk8
 android:
   components:
     - tools
-    - tools # To fix https://github.com/travis-ci/travis-ci/issues/6040
-    - platform-tools
-    - build-tools-26.0.1
+    - build-tools-26.0.2
     - android-26
 
-  licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
-
 env:
   global:
     # COMPONENT_GOOGLE_REPO
@@ -44,8 +37,6 @@ cache:
     - $HOME/.m2/
 
 before_install:
-  - yes y | $ANDROID_HOME/tools/bin/sdkmanager --update
-  - yes y | $ANDROID_HOME/tools/bin/sdkmanager --licenses
   - ./travis/scripts/decode_private_configs.sh
 
 install:

gradle.properties

@@ -1 +1,3 @@
-org.gradle.jvmargs=-Xmx3584m
+org.gradle.jvmargs=-Xmx3584m
+#https://github.com/TwidereProject/Twidere-Android/issues/963
+android.enableAapt2=false