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

Skip to content
Commit a6e57a96 authored by sqian's avatar sqian
Browse files

resolve merge conflicts of 345a396c to oc-dr1-dev 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9
parents ec37054b 345a396c
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