tree b412a4e74542d0b27fc6f7f62a6cb415e3e4e5ab
parent 63b9a3c79ad75791d79fa7d4c20faed11cca3bd5
parent 1586c28aba3efee842848fe82d05c47e3c8f100c
author Greg Kaiser <gkaiser@google.com> 1698717211 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698717211 +0000

[automerger skipped] Fix lunch choices for git_main am: 26a6e0878b am: a192601e9b -s ours am: 1586c28aba -s ours

am skip reason: Merged-In Iae9d3de2ee9b5ca7b15c4b78abc548ea434e575e with SHA-1 26a6e0878b is already in history

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

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