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

Skip to content
Commit c59116a6 authored by Pinyao Ting's avatar Pinyao Ting
Browse files

resolve merge conflicts of 8a739f95 to ub-launcher3-master 

Bug: None
Change-Id: Ieb5ae70464d4fa964622310c67e0dd4b58660cc3
Test: I solemnly swear I tested this conflict resolution.
parents fb553edb 8a739f95
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