This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR cherry picks patch fixes made to
release-android-v4.2.0
to master.Capturing discussion with @ivovandongen: that the approach of patching master and cherry picking to release branch (reverse what happened here) is more logical in a multi platform project. This keeps changes between master/release branches minimal and makes resolving merge conflicts occur after development instead of occurring after release. From now on let's try to apply this as a best practice.
Review @ivovandongen
cc @mapbox/android