diff options
| author | Dave Mankoff <mankoff@google.com> | 2021-08-10 20:19:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 20:19:38 +0000 |
| commit | 414288574a60aa0842b2d436049af2a84a6344cd (patch) | |
| tree | 6da1311abc5b9539ea69a07be5cb98d02d4b7a25 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f6b9251fbcb6e956cb10b15e573fd75914cda86b (diff) | |
| parent | 642240ef30867dcdcbf40faf40885b371f6a5bb3 (diff) | |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours am: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358518
Change-Id: If16530b64c7151e71a6cd872afef4ce2c0e9f45b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions