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

Commit 84957239 authored by Ivan Podogov's avatar Ivan Podogov Committed by android-build-merger
Browse files

Really resolve merge conflicts of 5f4cb939 to nyc-mr2-dev-plus-aosp 

am: 875b7834  -s ours

Change-Id: I5c9784c3e3c349585f32d44364f7876417483dd9
parents 8f87c3ef 875b7834
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