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

..

cpp

Refactor Android render loop to limit frame rate to 60 FPS

2015-09-24 18:04:26 +10:00

java

Merge branch 'release-android-v0.1.0'

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

mapboxgl-app.gypi

Fix build with Crashlytics NDK on 64bit

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