Commit Graph

3 Commits

Author SHA1 Message Date
Antonio Zugaldia
7e30025abb Merge remote-tracking branch 'mapbox/master' into 2317-espresso
Conflicts:
	src/mbgl/util/geojsonvt
2015-09-15 17:58:36 -04:00
Leith Bade
0cbe7e07f5 Use OkHTTP to implement HTTPContext on Android.
Closes #823
2015-08-11 11:59:08 +10:00
Konstantin Käfer
e6053aa547 Make build system architecture agnostic to remove Android special case 2015-08-04 14:08:58 +02:00