Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 977d9931 authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Disallow using error-prone merge strategies" into mainline-prod

parents 7263dc47 76b232f2
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment