Brad Leege 72aaf3934a Merge branch 'master' into 1856-material-take-2 ...

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

2015-08-12 18:22:17 -05:00

..

main

Merge branch 'master' into 1856-material-take-2

2015-08-12 18:22:17 -05:00