Skip to content
Commit 23a355bd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Check 64-to-32-bit transition in system_server for... 

[automerger skipped] Merge "Check 64-to-32-bit transition in system_server for Tagged Ptrs [#2]." am: fbe9d7e8 am: 19740a47 -s ours

am skip reason: Change-Id Ida6aa56093de6b6b03e78e6295bea546219ad864 with SHA-1 ba160a28 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1286133

Change-Id: Ic5e0d367548de4b97e4e7f4f8bc8ff7224f8b8af
parents 9dece9ac 19740a47
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment