Christopher Tate 5e380f096c resolve merge conflicts of 7641889 to lmp-mr1-dev ...

am: cebcde3b5a

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

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a

2016-04-20 00:05:54 +00:00

..

java/com/android/server

resolve merge conflicts of 7641889 to lmp-mr1-dev

2016-04-20 00:05:54 +00:00

jni

…

Android.mk

…