tree d10f82b46f68bfd12992a4b95a4b2daaae99a15f
parent f249a6863cb3df53b238394986a06c0c0acf56cd
parent 96bc093fa4d0d6bd209f601e303c7d60f10b8696
author Greg Kaiser <gkaiser@google.com> 1698717200 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698717200 +0000

[automerger skipped] Fix lunch choices for git_main am: cff9d02a9c am: 5131f0a0e5 -s ours am: 96bc093fa4 -s ours

am skip reason: Merged-In I81187827ee2a98a9efa19a0f729f1c7d17c01aaa with SHA-1 cff9d02a9c is already in history

Original change: https://android-review.googlesource.com/c/device/generic/art/+/2811333

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