Leith Bade 8388edcfbf Merge branch 'release-android-v0.1.0' ...

Merging to resolve conflicts on release branch so final merge tomorrow is clean.

Conflicts:
	android/cpp/native_map_view.cpp
	android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
	include/mbgl/android/native_map_view.hpp

2015-09-25 08:04:04 +10:00

..

src/main

Merge branch 'release-android-v0.1.0'

2015-09-25 08:04:04 +10:00

build.gradle

#894 - Updating Android Support Libraries to 23.0.1

2015-09-07 12:05:24 -07: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 Android build tools 23.0.1

2015-09-11 15:13:23 -07:00

lint.xml

Ignore lint error from OkHTTP

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

proguard-rules.pro

Added proguard config for SDK

2015-08-31 10:30:08 +02:00