summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorShuo Qian <shuoq@google.com>2020-11-10 04:51:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-10 04:51:25 +0000
commit9a0675c3dd9bdf80eeeae466efde353dc91ea2d4 (patch)
treec4425e165b8ac26554326b620da13a6950b294ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentc15b5cc4cda12377fd47386319789101988f838f (diff)
parentb570ddfa0582b40611f0d54039f898297581180a (diff)
[automerger skipped] Merge "Introduce new App Ops permission for 3rd-party InCallService" am: 9666e05985 am: 84838b0a56 am: b570ddfa05 -s ours
am skip reason: Change-Id Ie0f790aab2edcd52cfdbded2630347b9f8dd4d49 with SHA-1 6147275aa7 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1484359 Change-Id: I20946a1c35fdb12511bd4acb129d7d5d557e8b45
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions