diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-08-17 20:39:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-17 20:39:42 +0000 |
| commit | 7804035c8660d865bc121d63d3f6d72d27d3dc02 (patch) | |
| tree | 314dd56eb834f24aa34c9b36d747619235ff8bd8 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fcbaaafb3eff8c7bfaa0417ea71124990f8e9eb1 (diff) | |
| parent | be051117ba9327d0ec44ef1d7a1c37c3fa1b1a92 (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: be051117ba -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: I32a0eaca2343bf587eba2f4a6c3e22b096fe32a1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions