Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Android] fixes remember settings values, clear data on exit items, conflict with shields (uplift to 1.26.x) #9049

Merged
merged 1 commit into from
Jun 15, 2021
Merged

[Android] fixes remember settings values, clear data on exit items, conflict with shields (uplift to 1.26.x) #9049

merged 1 commit into from
Jun 15, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 8, 2021 •
edited by kjozwiak
Loading

Uplift of #9040

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team June 8, 2021 18:56
@brave-builds brave-builds self-assigned this Jun 8, 2021
@brave-builds brave-builds added this to the 1.26.x - Beta milestone Jun 8, 2021
@alexsafe alexsafe force-pushed the pr9040_fix-settings-new-2_1.26.x branch from f62bbfa to e9af4da Compare June 15, 2021 14:10
@alexsafe alexsafe added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Jun 15, 2021
kjozwiak
kjozwiak approved these changes Jun 15, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.26.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #9040 (comment).

@kjozwiak kjozwiak merged commit 75b0e41 into 1.26.x Jun 15, 2021
@kjozwiak kjozwiak deleted the pr9040_fix-settings-new-2_1.26.x branch June 15, 2021 16:15
This was referenced Jun 15, 2021
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.26.x - Release
Development

Successfully merging this pull request may close these issues.
4 participants
@brave-builds @kjozwiak @alexsafe @brave-browser-releases