Brad Leege 93940864ec Merge branch 'master' into 2244-texture-view ...

# Conflicts:
#	android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java

2015-09-09 14:59:42 -05:00

..

java/com

Merge branch 'master' into 2244-texture-view

2015-09-09 14:59:42 -05:00

res

#894 - Basic port of InfoWindow

2015-09-07 12:03:33 -07:00

AndroidManifest.xml

Improve support for Andrioid M

2015-08-18 19:15:42 +10:00