diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2019-09-04 17:11:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-04 17:11:29 -0700 |
| commit | bb04107181e2b9274d1672be5f8323cdfb8aabb0 (patch) | |
| tree | 4d707041428af970aca2bddcd19888b5a1bfb534 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 77e90072719f620d8c8d5fd212d9c07b225398c3 (diff) | |
| parent | 511160a95f41b0e7d93884814d312058d8112675 (diff) | |
[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4 am: 023af61a7b
am: 511160a95f -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history
Change-Id: I3d93ee17ecf49c064b40d86eec9de0d570c34ae3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions