diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-17 20:16:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-17 20:16:59 +0000 |
| commit | be051117ba9327d0ec44ef1d7a1c37c3fa1b1a92 (patch) | |
| tree | 6b0e0cbb54f08e2be8611127b067ecf0d83d60ab /rs/java/android/renderscript/ProgramStore.java | |
| parent | 8e137b92a18d5d69ef887e23d66eb82665616c50 (diff) | |
| parent | ad51a77a598cb3460fd72ef9df45a0644acc58b4 (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: ad51a77a59 -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: I6c7ae6fbd136fb6b4d6d71b8a9a81238b5bd58d2
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions