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

..

gradle/wrapper

Applying suggestion from Android studio to use Gradle URL with source code to enable in IDE documentation for Gradle files

2015-08-07 10:14:39 +10:00

MapboxGLAndroidSDK

Merge branch 'release-android-v0.1.0'

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

MapboxGLAndroidSDKTestApp

#2414 - Removing Crashlytics NDK integration as it's preventing TestApp from running

2015-09-24 10:11:58 -05:00

.gitignore

Fix build with Crashlytics NDK on 64bit

2015-09-24 10:38:03 +10:00

build.gradle

#1982 - Updating to 2.5

2015-08-03 17:05:46 -05:00

checks.xml

#826 -Adding checkstyle to TestApp build process.

2015-02-09 17:51:46 -08:00

gradlew

Add java files

2014-11-06 00:04:48 +11:00

gradlew.bat

Add java files

2014-11-06 00:04:48 +11:00

settings.gradle

#826 - Reordering modules

2015-02-10 12:42:14 -08:00