Fabian Guerra 42bcb4b405 Merge branch 'release-agua' into master ...

# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/ios/CHANGELOG.md
#	platform/ios/ios.xcodeproj/project.pbxproj
#	platform/macos/CHANGELOG.md

2018-01-17 09:41:37 -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-17 09:41:37 -05:00

.gitignore

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

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

build.gradle

[android] - move gradle files to dedicated folder

2018-01-11 21:31:25 +01:00

gradle.properties

[android] - bump snapshot version to 5.3.2

2018-01-10 14:28:04 +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