diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-03-12 00:52:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 00:52:26 +0000 |
| commit | e14511d6e7724f6f9cbaa78758c00aadc69b1aed (patch) | |
| tree | 2b48ce798327555f31563d15c990882ebd7e5361 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 105a6940d6607294dd8e9f12a7e557b281f32cfe (diff) | |
| parent | 1764ceaa6761c978bf720185e301aad8d09ac0ac (diff) | |
[automerger skipped] Merge changes from topic "ethernet_specifier" am: c77293b7a9 am: 2943678b0e am: 1764ceaa67 -s ours
am skip reason: Change-Id Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989 with SHA-1 4e5222b9da is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0133b6f49eac269c5704e5a1dbdfecc85507ae32
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions