diff options
author | Dave Mankoff <mankoff@google.com> | 2021-08-09 21:38:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-09 21:38:30 +0000 |
commit | f08acfef4898762568cbeb42614c412a010d6d2d (patch) | |
tree | 44eccc2e76fc5aeaddc7388fa7a4894f316ac35c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fdabb144e32a0ed1487a8bdae9ee7ddebbecb36c (diff) | |
parent | 23ee1b87bb87301a8f2f8044603b29141ae76a69 (diff) |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5b3 -s ours am: 23ee1b87bb -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 25b172abfd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359209
Change-Id: I9b1206f78bab4efe28eeba825876d14fe9e76b02
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions