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

Commit fc25616a authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

resolve merge conflicts of 44e07e07 to mnc-dev am: 825b7134 am: 8c635e73 am:... 

resolve merge conflicts of 44e07e07 to mnc-dev am: 825b7134 am: 8c635e73 am: 343600c3 am: b965ced0  -s ours am: 129c01af am: 88499d69
am: 244ce7e1

* commit '244ce7e1':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I0b31494265de0857521b0cbcfdcb1f77f458896f
parents 486fe68f 244ce7e1

There are no changes