diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 23:40:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:40:15 +0000 |
| commit | 40fbd71e24af6cd0d0bc3eddc9521f69f63bcecf (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f3da205ecdbe0a0aeecbd46cc02c47c9d87149df (diff) | |
| parent | 2b42f2d98721ec4520d0d26d4b417b4b45f3cab3 (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-mr1-dev am: 09b6ab6bdf -s ours am: 6a3d33dfcf -s ours am: 523686c52b am: d57c2cec33 -s ours am: 9f188f3867 am: 2df3d9fb22 am: 2b42f2d987
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216
Change-Id: I1ee4c53d68ad1b37a2ac788597fc8caf26544ebf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions