tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-android-v0.1.0'

Browse Source 
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
This commit is contained in:
Leith Bade
2015-09-25 08:04:04 +10:00
parent f21eb68277 3de441f20e
commit 8388edcfbf
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java
View File

@@ -31,7 +31,6 @@ import android.support.v4.view.GestureDetectorCompat;
import android.support.v4.view.ScaleGestureDetectorCompat;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;
import android.view.GestureDetector;
import android.view.Gravity;
import android.view.ScaleGestureDetector;