Fix last mobile merge into master #14620
Merged
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.
Description
Last PR #14503 was supposed to merge all the changes from
rnmobile/develop
(the development branch for mobile) to master. It seems I made some mistakes when resolving conflicts as a couple of changes fromrnmobile/develop
were omitted. This PR aims to fix this and havernmobile/develop
fully merged intomaster
.How has this been tested?
I checked manually by looking at the PRs merged into
rnmobile/develop
and what we have inmaster
.I also used the following command to find diff between
master
andrnmobile/develop
:Note that I'm excluding all non
.native.*
file here.