This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
[android] Cherry-pick changes for release-mojito v7.4.1 patch release #15278
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LukasPaczos
approved these changes
Aug 1, 2019
LukasPaczos
deleted the
ls-android-7.4.1-mojito-patch-release-cherry-pick
branch
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 changes needed for doing a 7.4.1 patch release to
release-mojito:git cherry-pick fa5646d112259758cee9fba0564a067376d0756)git cherry-pick afa7cea4c04f65c79829b4b2bf57e5c2882fd65b)git cherry-pick ff7fb5e46de275c8ceb4c2280edc020cff8b126e)mastermaster@LukasPaczos , I'm seeing similar cherry pick issues as the ones described in #15276.
Merge conflicts when I try to bring #15092 (
git cherry-pick fa5646d112259758cee9fba0564a067376d0756) into this pr:When I try to bring #15112 (
git cherry-pick ff7fb5e46de275c8ceb4c2280edc020cff8b126e) into this pr, I get the same change-has-already-been-brought-in message as in #15276: