| commit | 129c01af82df8560f9db9c990651e54689e55274 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Apr 20 22:09:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 20 22:09:28 2016 +0000 |
| tree | f1d0f7f74681f862ed8c9a7ede72b1c0ea1fcb4d | |
| parent | 5a6c58e00202ed83cd60a02cd6a79da65598b655 [diff] | |
| parent | b965ced011bdd7a3ec5450f93d1c58b889514f11 [diff] |
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced -s ours * commit 'b965ced011bdd7a3ec5450f93d1c58b889514f11': Kill the real/isolated uid group, not the ApplicationInfo uid Change-Id: Idf9a9824d411ca2b178fadda040f46864bc96a58