diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:26:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:26:51 +0000 |
| commit | 7d6482b4b1a0eddbd4deb54fd7d6aed6fcf958e2 (patch) | |
| tree | ce8e6b59e7d8cf09befc39cca71bcb3a9c6610e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4bc1c08af1f7118afe58a653558ca2bf50740a94 (diff) | |
| parent | 3806a2a28fee3aedc6909d3d3219bfd5ace7e257 (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: 3806a2a28f -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: I476d3652c195ec7832f8333fb2c6a920b22992d7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions