Merge branch 'update_buildtools' of git://github.com/BRNmod/android_packages_apps_GmsCore

2015-11-17 21:57:01 +01:00 · 2015-11-17 21:57:01 +01:00 · a1079e12be
parent 28c11da033 d42c2f61c5
commit a1079e12be
4 changed files with 6 additions and 5 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -11,8 +11,9 @@ script:
  - ./gradlew assembleDebug -x lint
 android:
  components:
-  - extra-android-m2repository
-  - build-tools-23.0.1
+  - tools
+  - build-tools-23.0.2
  - android-23
+  - extra-android-m2repository


--- a/extern/GmsApi
+++ b/extern/GmsApi
@ -1 +1 @@
-Subproject commit f0ec7e606f3e6e3a219eb87266c4dae1828b5083
+Subproject commit 5ed675a90b0d9831b06845ba2b95d7de3433acf6
--- a/extern/UnifiedNlp
+++ b/extern/UnifiedNlp
@ -1 +1 @@
-Subproject commit 2bb70fe90c07fad8144094a80e14fdb1b99c557e
+Subproject commit 51bbf1ee1c1d4170cc2ada192a99585bc7b321b1
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@ -55,7 +55,7 @@ dependencies {

 android {
    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"

    sourceSets {
        main {