Skip to content
Commit 8c635e73 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

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

Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
parents cf0875a9 825b7134
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