diff options
| author | Christopher Tate <ctate@google.com> | 2016-04-20 00:05:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-20 00:05:54 +0000 |
| commit | 5e380f096c6056429190362d0ba5017ad1491a25 (patch) | |
| tree | d6803815ef65ec2f34c58fa26fd05c6404f36e0d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | be58fe035e8a852c903c3c1c397eaa980670d8f9 (diff) | |
| parent | cebcde3b5a1e406d953629d5b4c87347921a17de (diff) | |
resolve merge conflicts of 7641889 to lmp-mr1-dev
am: cebcde3b5a
* commit 'cebcde3b5a1e406d953629d5b4c87347921a17de':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions