diff options
| author | Julia Reynolds <juliacr@google.com> | 2022-01-21 03:30:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-21 03:30:42 +0000 |
| commit | 09a1321d8d70aa8e6481a1c4afa04c056f0aa265 (patch) | |
| tree | 4c84d5f816ac2dc9d0e8426f2edd9b0aaee53ca2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 222443606d0c990d7fcfcfe98ac54761b1142920 (diff) | |
| parent | 2675838e1b8b03c8c89bc6f4bc30211f718bd92a (diff) | |
[automerger skipped] Merge "DO NOT MERGE Prevent apps from creating blocked channel groups" into qt-dev am: f1dc5b1ee1 am: 960d42c069 -s ours am: 2675838e1b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16621952
Change-Id: I9a6597ab4b8bbda62b7c9b18bc58c8153e218ee7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions