tree e098c04e2f27f05ba75b30ed0b8bae8b6651b82a
parent 7e929b595c14feceb40d817fdf55a0a9206efc69
parent 748af27279090e4d530071d06ddace6f8c7f3a83
author Xin Li <delphij@google.com> 1689398008 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689398008 +0000

[automerger skipped] Empty Merge Android U (ab/10368041) am: 5aa78ce45b -s ours am: a4489c7ee1 -s ours am: 748af27279 -s ours

am skip reason: Merged-In I5b250866169d2a1aec38ef1b70f47563ddc7ac95 with SHA-1 b39db028c2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/manifest-merger/+/24086477

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