diff options
| author | Miranda Kephart <mkephart@google.com> | 2020-11-09 18:53:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 18:53:25 +0000 |
| commit | 523686c52bb54fcafcc3f3196c306b0459944e7d (patch) | |
| tree | 514114f86480a82bc7b709261fe8815081991fa9 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 8b691cfceadab956d4030834ddaddaaa78084938 (diff) | |
| parent | 6a3d33dfcfdb0c862b2301033a6cc5b5e3d5353e (diff) | |
[automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-mr1-dev am: 09b6ab6bdf -s ours am: 6a3d33dfcf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12773216
Change-Id: Ifedb412a5aeff6351a1ec3da61bd4113908ad331
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions