diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-09 23:40:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-09 23:40:23 +0000 |
| commit | 6bce44e06e7eb0508f8f1b019a3f0b8e3ae44ef2 (patch) | |
| tree | 884167f03987e592389fcce8669d06b82d9479d1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1fb156703750f6d0420c0c20192a44168da24c4c (diff) | |
| parent | 40fbd71e24af6cd0d0bc3eddc9521f69f63bcecf (diff) | |
Merge "[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" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions