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

2015-02-25 15:30:17 -08:00
parent 74e953cc48 380fd1fbf4
commit ecd7267fdf
9 changed files with 164 additions and 102 deletions
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -31,6 +31,7 @@ dependencies {
    compile 'commons-validator:commons-validator:1.4.1'
    compile 'com.android.support:support-annotations:21.0.3'
    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.squareup.okhttp:okhttp:2.2.0'
 }

 android {