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-10-05 23:47:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-05 23:47:27 +0000
commit1b3ce3d0c6d043e9151a50422727c5e853abff38 (patch)
tree4c5346ab3429265a4286fdffaeaa122466bed30d /rs/java/android/renderscript/ProgramStore.java
parentfc0ba9cab17e7f27af5f65571e7c6de439dcb8df (diff)
parentddb6bdf1677217376de8f06d3d0cb4e0fa49f5f8 (diff)
Merge "[automerger skipped] Fix the issue provider can be wrong when requesting slice permission am: 4cab9c3876 -s ours am: f994f0c0c4 -s ours am: 4843e3fd7a -s ours am: 52dec242d7 -s ours" into mainline-prod am: ddb6bdf167 -s ours
am skip reason: Change-Id I8b66c02786df4096dad74b7e76255d5ddd1d609d with SHA-1 e3eba1322b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12687723 Change-Id: I5e6cf1fe7db15e7dbf831f692c1bff49694b179b
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions