diff options
| author | Songchun Fan <schfan@google.com> | 2022-01-11 22:17:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-11 22:17:59 +0000 |
| commit | 6b46ab945b6a44a16eb040915df8cf827cebcf3f (patch) | |
| tree | 5407647e128f5fdb241a2f750490286de5aabffd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d32e53c8c7e84b9f63764e08e9a6738b0dc6c71f (diff) | |
| parent | 0efa555c75909f421bfe109ebb7c2f629dd6974c (diff) | |
[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-qpr-dev am: 8b21c15688 -s ours am: 6ea559b457 -s ours am: 0efa555c75 -s ours
am skip reason: Merged-In Ib0ba9f3786dda2d3174f3ea8c65d1061a3fcb586 with SHA-1 c981d90b49 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16572066
Change-Id: I7a41afe83888d600a4b4c4074c14ff888ded4d5e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions