diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-06 01:49:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-06 01:49:29 +0000 |
commit | 68259d71d7a5c5734ace909239ec92bd46d33630 (patch) | |
tree | fcf49524e8e0dbcb69aca7f9a975290fe91aa90f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f911dbe0ddfc47f1a38c9a5adf673d02ec50f85f (diff) | |
parent | 1b0f664125dc0e1ae9f362c5c6a1699d5666fe72 (diff) |
[automerger skipped] Merge "Fix the issue provider can be wrong when requesting slice permission" into qt-dev am: d665f5e619 -s ours am: b3069d3806 -s ours am: fafef50b5a -s ours am: faab5acee7 -s ours am: 177da181d7 -s ours am: 1b0f664125 -s ours
am skip reason: Change-Id I8b66c02786df4096dad74b7e76255d5ddd1d609d with SHA-1 149bb7e038 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12687663
Change-Id: Idfe4f6f9f6748090b1c1ebd84fc07db884edced0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions