diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:11:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-13 17:11:47 +0000 |
| commit | d6d7e76eec9b658a9adc4d4137e1934ce8fd436d (patch) | |
| tree | 0499fd7cab670d7543a006a636a61a070aed755b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 56d101e48755e76b1697774378f1f7f57c2c956a (diff) | |
| parent | 3e8ad0c666c154bd65625b63677e497b6b86513f (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Block TYPE_PRESENTATION windows on default display" into qt-dev am: 3d4cf34685 am: 3e8ad0c666 -s ours
am skip reason: subject contains skip directive
Change-Id: Ibd87b8f93f8016869a5407e60acbee86222bdc95
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions