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

Commit fb9c4264 authored by Collin Mulliner's avatar Collin Mulliner Committed by android-build-merger
Browse files

resolve merge conflicts of cea1d046 to nyc-dev-plus-aosp 

am: 8d532e47

* commit '8d532e47':
  use process groups for processes started by init

Change-Id: I720291ac0966333e56f2607fe219a56bca541ee8
parents ae9fe069 8d532e47
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