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

Commit e88c120e authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again 

The earlier resolution (a2a5ce49)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
parent a2a5ce49
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