Merge branch 'release-ios-v3.5.0-android-v5.0.0' into boundsj-merge-release-branch

# Conflicts:
#	cmake/core-files.cmake
#	mapbox-gl-js
#	platform/android/CHANGELOG.md
#	platform/ios/CHANGELOG.md
#	platform/macos/CHANGELOG.md
#	platform/qt/bitrise-qt5.yml
#	src/mbgl/gl/attribute.hpp
#	src/mbgl/gl/context.cpp
#	src/mbgl/gl/program.hpp
#	src/mbgl/map/map.cpp
#	src/mbgl/programs/program.hpp
#	src/mbgl/renderer/painter.cpp

1 files changed, 6 insertions, 6 deletions

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index 718b790df2..ec80186761 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -42,7 +42,7 @@ public class GeoJsonSource extends Source {
   }
 
   /**
-   * Create an empty GeoJsonSource with non-default {@link GeoJsonOptions}
+   * Create an empty GeoJsonSource with non-default GeoJsonOptions.
    *
    * @param id      the source id
    * @param options options
@@ -67,7 +67,7 @@ public class GeoJsonSource extends Source {
   }
 
   /**
-   * Create a GeoJsonSource from a raw json string and non-default {@link GeoJsonOptions}
+   * Create a GeoJsonSource from a raw json string and non-default GeoJsonOptions
    *
    * @param id      the source id
    * @param geoJson raw Json body
@@ -93,7 +93,7 @@ public class GeoJsonSource extends Source {
   }
 
   /**
-   * Create a GeoJsonSource from a remote geo json file and non-default {@link GeoJsonOptions}
+   * Create a GeoJsonSource from a remote geo json file and non-default GeoJsonOptions
    *
    * @param id      the source id
    * @param url     remote json file
@@ -105,7 +105,7 @@ public class GeoJsonSource extends Source {
   }
 
   /**
-   * Create a GeoJsonSource from a {@link FeatureCollection}
+   * Create a GeoJsonSource from a FeatureCollection.
    *
    * @param id       the source id
    * @param features the features
@@ -116,7 +116,7 @@ public class GeoJsonSource extends Source {
   }
 
   /**
-   * Create a GeoJsonSource from a {@link FeatureCollection} and non-default {@link GeoJsonOptions}
+   * Create a GeoJsonSource from a FeatureCollection and non-default GeoJsonOptions.
    *
    * @param id       the source id
    * @param features the features
@@ -194,7 +194,7 @@ public class GeoJsonSource extends Source {
   /**
    * Updates the GeoJson
    *
-   * @param features the GeoJSON {@link FeatureCollection}
+   * @param features the GeoJSON FeatureCollection
    */
   public void setGeoJson(FeatureCollection features) {
     nativeSetFeatureCollection(features);