Brad Leege 1972d932d5 Merge branch 'release-android-v4.1.1' ...

# Conflicts:
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	test/util/mapbox.cpp

2016-07-19 16:32:45 -05:00

..

src/main

Merge branch 'release-android-v4.1.1'

2016-07-19 16:32:45 -05:00

build.gradle

[android] #5131 - update okhttp dependency

2016-05-25 14:09:50 +02:00

deploy.sh

[android] Move into platform subdirectory

2015-12-16 14:52:29 -08:00

gradle.properties

[android] #5725 - Updating version to 4.1.1

2016-07-19 13:49:20 -05:00

lint.xml

[android] Move into platform subdirectory

2015-12-16 14:52:29 -08:00

proguard-rules.pro

Add package 'offline' to proguard keeps

2016-03-04 16:00:13 -08:00