tree 6dba6a8ddcbefd1eeef221e11b217798d2ba4db4
parent 152fe81f90facc5a1074d801b30f253b2949903d
parent 20801230975bdc96361441cc2a1aeb36b5cbc52d
author Xin Li <delphij@google.com> 1629229610 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229610 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: cb6726460e -s ours am: 2080123097 -s ours

am skip reason: Merged-In I743ce25b43b75e9c2ee24580749a292608d16313 with SHA-1 152fe81f90 is already in history

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

Change-Id: I5572bdc894787c45384e3d83cd747c27cda6b0e1