diff options
| author | Pinyao Ting <pinyaoting@google.com> | 2019-09-04 16:51:29 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-04 16:51:29 -0700 |
| commit | add9e2eba9fe99091b539ec5caf008fc69f76a15 (patch) | |
| tree | d712167903d424e26bcc17fa7c74fc781ae07f52 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2e477bf54bd273b74251236c5eb9d7c20775a989 (diff) | |
| parent | e3f595c0a4abacbd02c479dbfb56d00f3cbf5eb8 (diff) | |
[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4
am: e3f595c0a4 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history
Change-Id: Iac06ef3d7f2b739798dea2b2d79ee595aebcfb67
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions