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

Commit 09070f22 authored by junyulai's avatar junyulai Committed by Automerger Merge Worker
Browse files

[automerger skipped] [SM07] Make combine subtype configurable from Settings... 

[automerger skipped] [SM07] Make combine subtype configurable from Settings am: b56b6138 am: 98aeabbf -s ours am: 0a280617 -s ours

am skip reason: Change-Id Ic94da540afa479ed18f1b6fbda4ae3216c37476b with SHA-1 1be2d732 is in history

Change-Id: I549da7cb25b1c44594542f528b0ab7b1e4f12a5e
parents 84ae3c7b 0a280617
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