diff options
author | Dave Mankoff <mankoff@google.com> | 2021-08-09 21:47:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-09 21:47:37 +0000 |
commit | c57c02c7d461844363425817a4a88ca9e4b666e3 (patch) | |
tree | e25fa19d415d7e38b2b752996c9586665557b019 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fd16048c92f0eb8a002918af226dad0e863e569c (diff) | |
parent | f08acfef4898762568cbeb42614c412a010d6d2d (diff) |
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5b3 -s ours am: 23ee1b87bb -s ours am: f08acfef48 -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: I33046aacf66155fedd9c0015b26f740e17be8ad0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions