summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorMiranda Kephart <mkephart@google.com>2020-11-10 02:36:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-10 02:36:33 +0000
commit7306373e49e5689b3f2f2fbac33ec1c803cecde9 (patch)
tree884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent33018a55c729da17e0ed4e881a18f7833c234bd2 (diff)
parentaa8904e17556d5fd36ed2c9c6da90ca5d12d1eee (diff)
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5bce am: 0d82d9ffc9 am: a4fbde5687 -s ours am: b1b2354740 -s ours am: 29802fb39f am: 378d3ae57d -s ours am: 8254a62829 am: baf4c15026 am: aa8904e175
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217 Change-Id: I676d6d2011b0657a80ec095dfd4dc29bd77a96a3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions