tree e3bb59655fcd25eea69005ae8a70a35790c6cef8
parent 1d3f7ed4b7128d3ba8f3368016f301a240479c39
parent 586a65b551e626c9d1f4e60af4fed092ad6f6ed6
author Xin Li <delphij@google.com> 1646820303 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646820303 +0000

[automerger skipped] Merge "Merge Android 12L" am: 15ce0a2279 -s ours am: 071e24e420 -s ours am: 586a65b551 -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: I8bd2ccaeb2871a164c68f89746e2dae14bd0af19