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

..

lint

Solve lint issues, reduce baseline (#9627)

2017-07-28 19:36:13 +02:00

src

Merge branch 'release-agua' into master

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

.gitignore

[android] add lint using current baseline as starting point (#9318)

2017-07-21 14:03:37 +02:00

build.gradle

[android] - add filesource activation/deactivation to OfflineRegion status and deletion

2018-01-23 12:09:48 +01:00

gradle.properties

[android] - release android v5.3.2, bump snapshot version

2018-01-23 20:26:53 +01:00

lint-baseline-local.xml

Solve lint issues, reduce baseline (#9627)

2017-07-28 19:36:13 +02:00

lint.xml

[android] Move into platform subdirectory

2015-12-16 14:52:29 -08:00

proguard-rules.pro

[android] - bump proguard config for OkHttp 3.8.0

2017-09-14 07:44:35 +02:00