diff options
author | Dave Mankoff <mankoff@google.com> | 2021-08-10 14:47:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 14:47:42 +0000 |
commit | bc0c531069095115f5f9db7ebe3408f413641925 (patch) | |
tree | 360618c2f4ee1d84ecc9981f9407bb734451e364 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 01429a24a157abd5d02d116e01cc905b1af88b8a (diff) | |
parent | f27380d2ed5d5cecc0b6bb846487822613ce7495 (diff) |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 am: f27380d2ed -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520
Change-Id: Ic422af33ef81f4f78bc893c56958da6c54e5cb61
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions