diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 02:59:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 02:59:38 +0000 |
| commit | 50fd6d5d0949e8a1747e6eec7b29d0c1b92c9223 (patch) | |
| tree | bd116ec6cf8216fd61ecddbd45aac712a8f15c01 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ced71357a53282cb142119cfd848ed6ef366e2b8 (diff) | |
| parent | 7306373e49e5689b3f2f2fbac33ec1c803cecde9 (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 am: 7306373e49 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: I0eb65f9c7c8eca36cd54f89a5e79833b6cfc11a2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions