tree e3bb59655fcd25eea69005ae8a70a35790c6cef8
parent 8f43abd8f291d0d27cbd85ac2d51037bb0031abb
parent c0ed78298099a9e174ba51d6d511379090c28bc8
author Xin Li <delphij@google.com> 1646820140 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646820140 +0000

[automerger skipped] Merge Android 12L am: b4c054c621 -s ours am: bfc6d47c60 -s ours am: c0ed782980 -s ours

am skip reason: Merged-In I33dbff12e154a0eefcc278fa3feb2f28936fe37b with SHA-1 08c53ffffb is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2013456

Change-Id: I3af1d8ac8572c996954be73fa26f58494a602e47