Skip to content
Commit 129c01af 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: 343600c3 

am: b965ced0  -s ours

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

Change-Id: Idf9a9824d411ca2b178fadda040f46864bc96a58
parents 5a6c58e0 b965ced0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment