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

Skip to content
Commit d7ecd0d2 authored by Andrei Onea's avatar Andrei Onea
Browse files

resolve merge conflicts of 1faafcb4 to stage-aosp-master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I055f014081e454b1dcfb8523a0387d7bc4b4ff9a
Merged-In: I981067477f6f4aa435459c0bc9a52099e6f5d445
Exempted-From-Owner-Approval: merge conflict resolution
parents 736173bb 1faafcb4
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