Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into android-mason

Conflicts:
	android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
This commit is contained in:
Justin R. Miller
2014-11-12 09:45:46 -08:00
20 changed files with 317 additions and 223 deletions

View File

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mapbox.mapboxgl.app"
android:versionCode="1"
android:versionName="1.0" >
android:versionName="0.1" >
<uses-feature android:glEsVersion="0x00020000" android:required="true" />