tree 3d38ed71fb5df57061b2b8d76106419418efae16
parent f163301f0b5601b3dc1171edd10968c5bfa185e6
parent 13ac349b59dcc9d61c8774fa7130432e61db1001
author Xin Li <delphij@google.com> 1656386366 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656386366 +0000

[automerger skipped] DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363 am: b6eb194bd4 -s ours am: 10943f8dae -s ours am: 2a74ad5c11 -s ours am: 13ac349b59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id1f95d1df2221a294eb48f3f37ddefabd26928fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>