Brad Leege 72aaf3934a Merge branch 'master' into 1856-material-take-2 ...

# Conflicts:
#	android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java

2015-08-12 18:22:17 -05:00

..

src/main

Merge branch 'master' into 1856-material-take-2

2015-08-12 18:22:17 -05:00

build.gradle

added tracking modes

2015-08-06 12:55:15 +02:00

deploy.sh

#826 - Adding make command to build GL core, assemble .aar, and publish to Maven Central

2015-02-11 13:44:07 -08:00

gradle.properties

Update to lastest Android SDK

2015-05-06 20:48:11 +10:00

lint.xml

Ignore lint error from OkHTTP

2015-02-26 10:25:36 -08:00