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

Commit f18e4850 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: 1f116844 -s ours am: ba56be23 -s ours

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

Change-Id: I904c8a8cba1552669738cbb95307629ef2bf4fb0
parents 86339fbe ba56be23

There are no changes