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

Skip to content
Commit 935e0f2c authored by Lyn Han's avatar Lyn Han Committed by Michał Brzeziński
Browse files

resolve merge conflicts of 0f8dfa53 to sc-v2-dev 

Bug: 195033110
Change-Id: I4274fd4024b8cf725f8db7bd0a3fdffd7ec6de84
Merged-In: I07dbb58b234bee06c31a67fd38ab363ff13d9458
(cherry picked from commit 4bbc725f)
parent b7c2ca68
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment