diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:10:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:10:24 +0000 |
| commit | 671263bccddb4dcda2807614c6f710abdbec07eb (patch) | |
| tree | de77466a6fc5ecb28cecbf63d1a2fcf583386aa1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dab83653331bde6ae5183b5a51a61b793cb97b0a (diff) | |
| parent | cd5bad24805a1a34b0b3c22f2f0cf320d2564821 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I132c5c5f55dd2426bd194df7ea871801e3e7cce4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions