tree de3bf9c397fadb1f7baedb9f22d0e02f2d9165cf
parent f8a3a691acb7ad666fb9c49afa077bd5b51fd132
parent a6af8cf0b4ca2eb4e691586a37fcff6201cb9b91
author Xin Li <delphij@google.com> 1702335457 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702335457 +0000

[automerger skipped] Merge Android 14 QPR1 am: 227a562993 -s ours am: ec0186f9b4 -s ours am: a6af8cf0b4 -s ours

am skip reason: Merged-In Id77761a24c72b0d08c4a4d300822c839664a890e with SHA-1 acb54f84d8 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/SdkExtensions/+/2862454

Change-Id: I100fdbf2788da435098ee8cff6e5983b1b0683d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>