diff options
| author | Xin Li <delphij@google.com> | 2020-06-08 16:42:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 16:42:05 +0000 |
| commit | 994c2406e2869b82241fad970a528748773f70d8 (patch) | |
| tree | 2752f6dde1ee6f7b8d5096c05b83165accb9929b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 64b1acdedf4685b6d26bbf867c5e57237344cc77 (diff) | |
| parent | 393a81a9b04e74956ded2d16141abc44bd98c0e9 (diff) | |
[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: d7785982ac -s ours am: 8028fe1945 -s ours am: fc8ba01070 -s ours am: 393a81a9b0 -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: Id2777f3b97ff4733dfda185b8feceb4cc25330bc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions