tree d56744ec16d3fa0dead14f4de28ebc82acca9dc4
parent 4b808123bc659b6c3a2dd56e3d5d20b98c77aa3a
parent 2b4e582a8b798266ab34d181695f7b28c520942f
author Xin Li <delphij@google.com> 1633679784 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679784 +0000

[automerger skipped] Merge Android 12 am: 76038821b2 -s ours am: 5cd735933c -s ours am: 2b4e582a8b -s ours

am skip reason: Merged-In If1cc0f0521aa0e27a0308793e4b632f018321240 with SHA-1 31b396b56f is already in history

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

Change-Id: I92c020098293b42b3218ba67d55726e23c0b4835