This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
[android] Cherry-pick changes for release-nectar v8.0.2 patch release #15276
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
5 tasks
LukasPaczos
approved these changes
Aug 1, 2019
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 an 8.0.2 patch release to release-nectar:
masterI get nasty core merge conflicts when I tried to cherry-pick #15065 and #15092. @LukasPaczos , you can look into solving the conflicts?
When I tried to cherry-pick #15112, I got
Seems that #15112 was already brought into the
release-nectarbranch? I didn't see it in the 8.0.1 release. The advice in threads like https://stackoverflow.com/a/50052479/6358488 didn't help on my local machine.