Skip to content
Commit 5e380f09 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

resolve merge conflicts of 76418899 to lmp-mr1-dev 

am: cebcde3b

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

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
parents be58fe03 cebcde3b
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