summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorDavid Su <dysu@google.com>2020-10-07 10:09:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-07 10:09:51 +0000
commit1d9709071dbac83f3cd3ec5efa4652531b78c3d6 (patch)
tree6d80788b70ab5dea1f834f8d191d6f303f5e7ed2 /rs/java/android/renderscript/ProgramStore.java
parentff3649cd5dc26d7ffd8fd98ad6dd406a656bf036 (diff)
parent8bb65f94c818f524379bf0050002ccecf743ca8b (diff)
[automerger skipped] Merge "Backport sendBroadcastAsUserMultiplePermissions to oc-dev" into oc-dev am: d1bcf628bd am: 60cf3eebd5 -s ours am: 615d6b6ba6 -s ours am: aeac5e7d30 -s ours am: 5c2b86fbed -s ours am: 4c94806e28 -s ours am: 008d947b59 -s ours am: 81e1bdcb6f -s ours am: 8bb65f94c8 -s ours
am skip reason: Change-Id I857ea00cc58a0abbb77960643f361dd6dd9c8b56 with SHA-1 e57c25a451 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12724292 Change-Id: I5962cb5d568d6aa02b7b2d4489e3c348fa425c37
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions