diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 23:20:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 23:20:59 +0000 |
| commit | eb8b442022e9bc730ffd9840fdaeca09107cf979 (patch) | |
| tree | ce8e6b59e7d8cf09befc39cca71bcb3a9c6610e8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71f64ff1ac28bb6aecbf4f28f0e2c46fb7c73a2d (diff) | |
| parent | 671263bccddb4dcda2807614c6f710abdbec07eb (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: 671263bccd -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: I87bc72724f3c6b876a6423d1b932c5bac84a6953
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions