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

Commit ba56be23 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 skip reason: Change-Id I1bb9099371bd1a3f339396ef343c49b054fcef66 with SHA-1 6a3c94b3 is in history

Change-Id: I7f85860b4c54ac06d6b5b3c404239f4486d4ebb9
parents 37fd9560 1f116844

There are no changes