Leith Bade 74e953cc48 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-conversions ...

Conflicts:
	android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java

2015-02-24 17:16:52 -08:00

..

java/com

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

2015-02-24 17:16:52 -08:00

res/values

#826 - Renaming lib module to MapboxGLAndroidSDK

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

AndroidManifest.xml

Rename packages. Add GPS arrow.

2015-02-19 14:28:49 -08:00