summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-29 23:46:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-29 23:46:11 +0000
commitf87397ce3bc736c702fb92991a03de3a3785adbd (patch)
tree2352125759e7ca49596dc175d316c1f9e0cdf544 /rs/java/android/renderscript/ProgramStore.java
parente9a5aca11dc679bc30621a70e47857de2fd35bd5 (diff)
parent016d14586c7cbef24277300305755d92cff0958d (diff)
Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-dev am: b8a2504758 -s ours am: f3640afe28 -s ours am: 5ce7da37ac -s ours" into rvc-dev-plus-aosp am: 016d14586c -s ours
am skip reason: Change-Id I84679ea0636aa2097e25e23813c48134c9cc1d75 with SHA-1 6ad6ca2dbb is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10920692 Change-Id: I504a3df4ea4666d6d3f9c6cf926c49581723e92c
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions