Fabian Guerra da7759a273 Merge branch 'release-agua' into master ...

# Conflicts:
#	include/mbgl/style/conversion/layer.hpp
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java

2018-01-25 14:39:18 -05:00

..

java

Merge branch 'release-agua' into master

2018-01-25 14:39:18 -05:00

res

[android, ios, macos] Updated Ukrainian translations

2018-01-19 18:09:59 -08:00

res-public/values

[android] Add Configuration hook for local ideograph font family and demo activity

2017-12-18 12:17:22 -08:00

resources/fabric

[android] [auto] Update properties to version 5.1.4 in preparation for build.

2017-09-26 11:43:33 +02:00

AndroidManifest.xml

Downgrade min sdk to 14 (#10355)

2017-11-13 13:20:41 +01:00