diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-04-01 21:09:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-01 21:09:11 +0000 |
| commit | 3e8ecfad4290a17f838ba58544983616a1479e0e (patch) | |
| tree | 791ee61d92051f0e4c303294ad75cfa1cfeb845f /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 331cd1a9c94ad5060847961a4151838b40b4c1e1 (diff) | |
| parent | a3574db389b4b5ba9a23f5c122875f9fd7549bf9 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids" into pi-dev am: 28f2e1dfc2 -s ours am: eff24fc89f am: a3574db389 -s ours
am skip reason: subject contains skip directive
Change-Id: Ice8e53ec4708100dcb336e53797dfd7169c37fd8
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions