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

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

Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
parents 2dbac6ce 343600c3
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