tree 8abbab950346d8c319bc0847b328140cc6a64c0b
parent 2d48aab8cefafbc23e452522b18e9498ef8a31c5
parent 27769f538fce325f664f70c1e999908786b378fa
author Xin Li <delphij@google.com> 1633657179 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657179 +0000

[automerger skipped] Merge Android 12 am: b96fc21657 -s ours am: 27769f538f -s ours

am skip reason: Merged-In Id6088ae38b04e4587c41eed55b0a93051c4b353e with SHA-1 f6ec19ee96 is already in history

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1847346

Change-Id: Ieab64d96366db52604a798159801c94381bdaafe