diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2019-09-04 17:24:46 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-04 17:24:46 -0700 |
| commit | 7ba0126d49e70c557cea72a8dfffe9955e030b80 (patch) | |
| tree | 4d707041428af970aca2bddcd19888b5a1bfb534 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 79956e0e0d980d9bbe4f54c15dbe6691e44f3186 (diff) | |
| parent | ae7d884c09d4401f43963926a15542f583e6fdad (diff) | |
[automerger skipped] Merge "Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4 am: e3f595c0a4" into qt-r1-dev-plus-aosp
am: ae7d884c09 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history
Change-Id: I5aeb27f678838c6f1b0460ed5798b82e56789ec0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions