Merge remote-tracking branch 'origin/master' into feature/custom-vector-source

1 files changed, 2 insertions, 3 deletions

diff --git a/platform/android/src/style/android_conversion.hpp b/platform/android/src/style/android_conversion.hpp
index de0ac91502..d9b88ab52b 100644
--- a/platform/android/src/style/android_conversion.hpp
+++ b/platform/android/src/style/android_conversion.hpp
@@ -4,7 +4,6 @@
 
 #include <mbgl/util/logging.hpp>
 #include <mbgl/style/conversion.hpp>
-#include <mbgl/util/feature.hpp>
 #include <mbgl/util/optional.hpp>
 
 #include <jni/jni.hpp>
@@ -45,7 +44,7 @@ inline optional<mbgl::android::Value> objectMember(const mbgl::android::Value& v
 
 template <class Fn>
 optional<Error> eachMember(const mbgl::android::Value&, Fn&&) {
-    //TODO
+    // TODO
     mbgl::Log::Warning(mbgl::Event::Android, "eachMember not implemented");
     return {};
 }
@@ -82,7 +81,7 @@ inline optional<Value> toValue(const mbgl::android::Value& value) {
     } else if (value.isString()) {
         return { value.toString() };
     } else if (value.isNumber()) {
-        //Need to cast to a double here as the float is otherwise considered a bool...
+        // Need to cast to a double here as the float is otherwise considered a bool...
        return { (double) value.toNumber() };
     } else {
         return {};