diff options
author | Songchun Fan <schfan@google.com> | 2022-01-11 22:17:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-11 22:17:43 +0000 |
commit | 7f41fc04fcb58878ecae11873aa62335ab75188a (patch) | |
tree | 3ac1db20e74778684c268d1b4796816d35da288d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0efa555c75909f421bfe109ebb7c2f629dd6974c (diff) | |
parent | 556ec39a013ee8d2081bbc22c5c11a4072b534dc (diff) |
[automerger skipped] Merge "Don't abandon child sessions (1/n)" into rvc-dev am: 966fd5d60f -s ours am: 0f41c5ec5d -s ours am: 556ec39a01 -s ours
am skip reason: Merged-In Ib0ba9f3786dda2d3174f3ea8c65d1061a3fcb586 with SHA-1 d90d334467 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16572034
Change-Id: I5e8932a87ad90ed4099ebea0cd74bfedfe48efd8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions