tree c63e0b4f0ad10410bb2e02e9a41ae8a0c7c3a1b6
parent 44744dd7f4873635a595e98d692f232c2adf2e03
parent 62f5f4ecb1deae1dc1c2c5459630d6ca5f2ca856
author Xin Li <delphij@google.com> 1670852868 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670852868 +0000

[automerger skipped] Merge "Merge Android 13 QPR1" am: 68ebeac829 -s ours am: 2bfcbfab0a -s ours am: 62f5f4ecb1 -s ours

am skip reason: Merged-In Ie82f2c3efcc88d788f6e914ae37b6a9d38955cb5 with SHA-1 fa6cbb870b is already in history

Original change: https://android-review.googlesource.com/c/device/common/+/2336993

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