tree 0659a09f2bb73fa658386c2763cc8d4bfab6002d
parent 537d04088c931a1841b0a8fae53ac81e875cb664
parent 14e6f6fa57e568644789166573c44821e6ff35bf
author Xin Li <delphij@google.com> 1633679813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679813 +0000

[automerger skipped] Merge Android 12 am: 8d637d305c -s ours am: 682f7012bd -s ours am: 14e6f6fa57 -s ours

am skip reason: Merged-In I793b678232ad2a620eb137cb1640b89ff351f455 with SHA-1 7e63670840 is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1847375

Change-Id: I2e0fc2fbc6732eb28f3527227f08d8b5482ffebf