summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 20:53:55 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 20:53:55 +0000
commit859d26840254084aa78022c96963b7eeb052e15b (patch)
tree95336a986747e2f1fc288452d13d1459de4f6c3b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parente58b7b5a38c706545ccd2309492bc9bac11bfd93 (diff)
parent0a1c0ac4db37195ecec4ff720bde77e18052b975 (diff)
Merge "Merge "Make the output CryptoInfo.iv non-null" into rvc-dev am: da8620b7f7 am: 1fbebbe5a7 am: 5b226d5961" into rvc-qpr-dev-plus-aosp am: 0a1c0ac4db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11986785 Change-Id: Ibdb305cdb0c4c5bbd7f9d1a303a773dbb96f20d0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions