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

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

resolve merge conflicts of dfa79a62 to oreo-mr1-vts-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I10919718b841fdb33ab0e873d1b4bbd787fafcd2
parents c0243f2f dfa79a62
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