diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 18:12:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-05 18:12:35 +0000 |
| commit | ad6fd2a89407fb0d689eb11c373ac49c9c368385 (patch) | |
| tree | 21c5ed328d30804d1873e3e192d2afaf590610e9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 34229aaf735b07e1cf9246e4cb63866c2ff92040 (diff) | |
| parent | f8481c6dd3c4a8b43371f038d4c361e2b680a99d (diff) | |
Merge changes from topic "am-5c809b0f931842e5aa0800f5e2d57308" into sc-dev
* changes:
[automerger skipped] Merge "DO NOT MERGE Add generic rotary support for sysui overlay window" into rvc-qpr-dev am: 53107b6e79 am: 267b7d49d3 -s ours
[automerger skipped] DO NOT MERGE Add generic rotary support for sysui overlay window am: e076c2344e am: baef70ab50 -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions