summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramStore.java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-08-17 20:07:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-17 20:07:09 +0000
commitad51a77a598cb3460fd72ef9df45a0644acc58b4 (patch)
tree9cde8836ce9d65fe0109c24c7a4a3d68c96aa62d /rs/java/android/renderscript/ProgramStore.java
parent84a8f10f16e51fefb700b8ad977d0418e123b4e1 (diff)
parent23a355bdb2463812d92b6f9627c1ccec3931f430 (diff)
[automerger skipped] Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e821 am: 19740a4726 -s ours am: 23a355bdb2 -s ours
am skip reason: Change-Id Ida6aa56093de6b6b03e78e6295bea546219ad864 with SHA-1 ba160a28fd is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1286133 Change-Id: Icd82d7a56e4cba4201a4406194e53b8fa638a033
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions