diff options
| author | Christopher Tate <ctate@google.com> | 2016-04-20 22:13:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 22:13:07 +0000 |
| commit | e3e398f1964fa4a67d3ffad43110a78093f506d6 (patch) | |
| tree | e680a0e7e5223d3b991073474c36fcb483102324 /docs/html/sdk/api_diff/19/changes.html | |
| parent | 55db403c76ca2fb706352dcc7a9d861170e6d400 (diff) | |
| parent | 129c01af82df8560f9db9c990651e54689e55274 (diff) | |
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
Diffstat (limited to 'docs/html/sdk/api_diff/19/changes.html')
0 files changed, 0 insertions, 0 deletions