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