diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-09-05 00:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-09-05 00:13:07 +0000 |
| commit | 503e3e039f7a97d1a4c8cc9e98f71f3e5bcc104a (patch) | |
| tree | 4d707041428af970aca2bddcd19888b5a1bfb534 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bb04107181e2b9274d1672be5f8323cdfb8aabb0 (diff) | |
| parent | a87ad6666ce1b7d4739805f9ef626e4a25a3ab69 (diff) | |
Merge "[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" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions