tree 6cfa770b3542641f15291526099ac52c94c4d9fa
parent 0be54aa2e6bb4cb0740c7e0cc10344f31386ee13
parent 128d7fe3695706ddcbe66c345fc41e769e64bb75
author Xin Li <delphij@google.com> 1633679812 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679812 +0000

[automerger skipped] Merge "Merge Android 12" am: d1cae63beb -s ours am: 12132a97ff -s ours am: 128d7fe369 -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: I8adee6802de457e44d873bbd33b175834ac2624a