| commit | 343600c3ecff31826e50d40821927e446adb9b0a | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed Apr 20 21:43:17 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 20 21:43:17 2016 +0000 |
| tree | a5d08ec318dcb92ba7ce1d3f7fbb3700683e1248 | |
| parent | c441faa6de5618e9da029858ce83b3e129be2974 [diff] | |
| parent | 8c635e73c698302ce6661f227c274164972f048e [diff] |
resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 * commit '8c635e73c698302ce6661f227c274164972f048e': Kill the real/isolated uid group, not the ApplicationInfo uid Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3