summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorCorina Grigoras <corinac@google.com>2020-11-26 12:19:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-11-26 12:19:46 +0000
commit2384558421ca7cf3bb55263e0423abd601b46a9b (patch)
tree7ffef5254705adc5be201e90d574d0af0ab0e711 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent8fe7b891be8bbe8bb7b84638ac6c9e7c671d7261 (diff)
parent7b6ce0505209dca6e800c331fe0566a0f444a31e (diff)
[automerger skipped] Merge "DO NOT MERGE: Enable ENABLE_DYNAMIC_PERMISSIONS depending on MediaProvider." into rvc-qpr-dev am: 97fdd2ab04 am: 7b6ce05052 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12977056 Change-Id: I3fa95d28318246057d0185453afcc45163434c32
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions