diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-10 01:50:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-10 01:50:52 +0000 |
| commit | ea7361a8064543396b039cb98cda2640d53b9394 (patch) | |
| tree | c0c1434efac7994e39152c293e0ac65ab075af9d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 04cf95ecaca7169041ac7dbeb488c574c6e1c159 (diff) | |
| parent | d6490ef65c25b1993a423c11df4412814a324eb7 (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: d6490ef65c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773217
Change-Id: I799b9d3449126b278c309ee06531f5fe78d62026
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
