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