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

This commit is contained in:
mar-v-in 2015-11-17 21:42:54 +01:00
commit 51bbf1ee1c
4 changed files with 7 additions and 6 deletions

View file

@ -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

@ -1 +1 @@
Subproject commit 236ef064e1293664f4a7dee9fbd0365ee6787ae7
Subproject commit f7fcb8e7cf966f58d784f450e061b88f96f73ecf

View file

@ -27,7 +27,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "23.0.2"
productFlavors {
NetworkLocation {

View file

@ -27,7 +27,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "23.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
}
@ -38,4 +38,4 @@ dependencies {
compile 'com.android.support:appcompat-v7:23.0.1'
compile project(':unifiednlp-api')
provided project(':unifiednlp-compat')
}
}