diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 05:09:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-11 05:09:32 +0000 |
| commit | 43e857c5c21f6b4f1d4a175148d058595fc7db81 (patch) | |
| tree | 649277fd2f3478c87eece21225a9af4ee7574820 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | cee788f5bdefd494a39fe7a11faed8c320a1aa84 (diff) | |
| parent | 72cb065b97e8873893c919075aab1c04f7fea0c2 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into oc-mr1-dev am: 3e2869e2c0 -s ours am: 72cb065b97 -s ours
am skip reason: subject contains skip directive
Change-Id: I117494767666d32cae0e2c25ae3465988754ac15
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions