summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorHui Yu <huiyu@google.com>2021-08-26 21:59:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-26 21:59:03 +0000
commit387bc6cb32c5f2f391ea6f5d9df74c691629d111 (patch)
tree822b0f261d011dade3e22b919cb33715ccc24091 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent5bda39799de666d26ae6d2feb3b233e68473389c (diff)
parent7aaecba06a35f90cf219360b369c47274be129a4 (diff)
[automerger skipped] Merge "Revert "BG-FGS-start while-in-use permission restriction improve..."" into rvc-dev am: 63bab23a9d am: 4a9a5f59c8 -s ours am: 7aaecba06a -s ours
am skip reason: Merged-In Idc88f274c7a323d175d65bb47eca041772ae9bb7 with SHA-1 6706c1acc0 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15676753 Change-Id: I79074fa6768200ed2644be7d3d90aa9164c3a7c3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions