tree 6cfa770b3542641f15291526099ac52c94c4d9fa
parent 09d18e7b365b938056be9d6ab7278158fe4e9c40
parent 4647e5eec274f0e6534e935f2e893424f40fe007
author Xin Li <delphij@google.com> 1633681790 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681790 +0000

[automerger skipped] Merge "Merge Android 12" am: d1cae63beb -s ours am: 12132a97ff -s ours am: 128d7fe369 -s ours am: 4647e5eec2 -s ours

am skip reason: Merged-In I9bb827bc5cf4f2bb5dc7cbb81d26aa44b074d366 with SHA-1 069a69b988 is already in history

Original change: https://android-review.googlesource.com/c/platform/tools/swt/+/1847901

Change-Id: Ibebd92c8896d9cf695d16e9e48fe8c4cf67320e4