Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-conversions

Conflicts:
	android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java
This commit is contained in:
Leith Bade
2015-02-24 17:16:52 -08:00
7 changed files with 41 additions and 92 deletions

View File

@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.10.1'
}
}