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

Commit 1f116844 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Reject services that are both critical and... 

[automerger skipped] Merge "Reject services that are both critical and oneshot" am: e8748755 am: 003d1827 -s ours

am skip reason: Change-Id I1bb9099371bd1a3f339396ef343c49b054fcef66 with SHA-1 6a3c94b3 is in history

Change-Id: I77ac5cf96ebbb7487e41ce027a897a75b3a53706
parents 72bdc3f2 003d1827
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