Fabian Guerra 187b6dc31c Merge branch 'release-agua' into master ...

# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp

2018-01-04 12:55:19 -06: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-04 12:55:19 -06:00

.gitignore

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

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

build.gradle

Merge branch 'release-agua' into master

2018-01-04 12:55:19 -06:00

gradle-checkstyle.gradle

[android] - add binding integration for expressions (#10654)

2017-12-19 08:55:48 +01:00

gradle-javadoc.gradle

[all] - update licenses to 2018

2018-01-03 18:41:25 +01:00

gradle-publish.gradle

[android] remove unnecessary jar generation from gradle-publish.gradle (#10625)

2017-12-05 10:12:16 +01:00

gradle-tests-staticblockremover.gradle

[android] refactor move unit tests from test app to sdk and add some annotation manager tests (add marker and add markers) (#8261)

2017-05-11 12:06:11 +02:00

gradle.properties

Android SDK renaming (#10609)

2017-12-19 10:40:06 +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