diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 05:09:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 05:09:24 +0000 |
| commit | cee788f5bdefd494a39fe7a11faed8c320a1aa84 (patch) | |
| tree | 649277fd2f3478c87eece21225a9af4ee7574820 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 29043c67d8008344c7d26f1f96383ff3f95a54fc (diff) | |
| parent | 5c1ada4bb3e769c260d305ce02e20db335fb68f5 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into pi-dev am: 5c1ada4bb3 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib2a356e3e264ba7b3118b1bd3857b92a1425f58f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions