summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2020-10-06 22:41:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-06 22:41:13 +0000
commit8a936e088dd15c39e85f9a18c368b8ed56fdfdc8 (patch)
tree6e2fa18d0769dc02ad18ca905a35e0cc494b6d10 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent7e53b789465c11e187406e23f3d2d94020ad5d50 (diff)
parent3d92e370f59c224aea8c47d39609d3addc10c099 (diff)
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-mr1-dev am: 3d92e370f5 -s ours
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 f955e56d51 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12729621 Change-Id: I262bad1ed18fccf08bc40de1878fb5c6785ebad3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions