OSDN Git Service

resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c...
authorChristopher Tate <ctate@google.com>
Wed, 20 Apr 2016 22:13:07 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 22:13:07 +0000 (22:13 +0000)
commite3e398f1964fa4a67d3ffad43110a78093f506d6
treee680a0e7e5223d3b991073474c36fcb483102324
parent55db403c76ca2fb706352dcc7a9d861170e6d400
parent129c01af82df8560f9db9c990651e54689e55274
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced  -s ours
am: 129c01a

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

Change-Id: I52a5a34af6acb17d63ae43ac999609de6994be88