tree 6dba6a8ddcbefd1eeef221e11b217798d2ba4db4
parent eb4eee4902e412cf54cc2b61074d393a5cc83cdf
parent 33eff6e06949ece4a6bca752cc586931df2c22c8
author Xin Li <delphij@google.com> 1633679826 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679826 +0000

[automerger skipped] Merge Android 12 am: 289961d5da -s ours am: 0cdd6bd67b -s ours am: 33eff6e069 -s ours

am skip reason: Merged-In I93bf9e6af8b5974f314a4da28410f98bccfced2d with SHA-1 cb6726460e is already in history

Original change: https://android-review.googlesource.com/c/device/generic/uml/+/1847336

Change-Id: I59de9399d4631f42d016794d030c03b335cba178