tree b510404b7c70023cd4e691ad4a3e42be5c1d9a53
parent b1697773450b7188035055d9373e11ca4ffc9f6b
parent 6132be309ba7b66e60a188efd19f6ccbe6550699
author Xin Li <delphij@google.com> 1639515629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1639515629 +0000

[automerger skipped] Merge Android 12 QPR1 am: 6132be309b -s ours

am skip reason: Merged-In I09d5e0ae043b421216856e23644beca76ce54d44 with SHA-1 b169777345 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/1921888

Change-Id: I84a0631305780373e1e81a85ce32d6e4a096c8ad