diff options
| author | Christopher Tate <ctate@google.com> | 2016-04-20 21:35:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 21:35:50 +0000 |
| commit | 8c635e73c698302ce6661f227c274164972f048e (patch) | |
| tree | ca48ecc3085e3fc9fdcd30d2da1562fc3f6ab3e0 /rs/java/android/renderscript/ScriptGroup.java | |
| parent | cf0875a9b69da9da5e16563eca33609e775d9195 (diff) | |
| parent | 825b7134699fbaaa16423c52b7b424d4a9afefb1 (diff) | |
resolve merge conflicts of 44e07e0 to mnc-dev
am: 825b713
* commit '825b7134699fbaaa16423c52b7b424d4a9afefb1':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
Diffstat (limited to 'rs/java/android/renderscript/ScriptGroup.java')
0 files changed, 0 insertions, 0 deletions