diff options
| author | Xin Li <delphij@google.com> | 2020-06-08 16:08:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 16:08:03 +0000 |
| commit | fc8ba0107080b72588dac6157fa824dd721b1357 (patch) | |
| tree | a1e4cf99278b5004a9a93407091334d51ab1548f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8274d0fba7a2793b8294da883abde273d75f69d1 (diff) | |
| parent | 8028fe19458a704e71d392dd7c616187294d5a16 (diff) | |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours
am skip reason: Change-Id I5e28537689d1a53e99f91eafd494eb3a0c890f46 with SHA-1 afbf77813b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1323623
Change-Id: I3811100a743b62c5a5e9f661647793b719824679
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions