resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced -s ours

Browse Source

am: 129c01a

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

Change-Id: I52a5a34af6acb17d63ae43ac999609de6994be88

...

This commit is contained in:

Christopher Tate

2016-04-20 22:13:07 +00:00

committed by android-build-merger

parent 55db403c76 129c01af82

commit e3e398f196

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available