tree 48dd055a3aae6ef8da806cfd5c3d18746c690886
parent 0f9332877c385ca2f022b03d95688b4eab2c71b4
parent 47b911b8fd3c2588fb7d75760ef2ab1ae488f9c8
author Greg Kaiser <gkaiser@google.com> 1698717245 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1698717245 +0000

[automerger skipped] Fix lunch choices for git_main am: f544c411ce am: e1344c069f -s ours am: 47b911b8fd -s ours

am skip reason: Merged-In I1492ec879e2131fbe5c7110573fd932712251a31 with SHA-1 f544c411ce is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/poplar/+/2811393

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