Merge "Expose --avb_resolve_rollback_index_location_conflict" into main am: 4605c0ec76 am: d08abd7a2c am: 92e57a39a9

Original change: https://android-review.googlesource.com/c/platform/build/+/2851825

Change-Id: I426878ee448a3d5c5488bb103eaa28f00cacdac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dennis Song
2023-11-29 10:29:22 +00:00
committed by Automerger Merge Worker

Diff Content Not Available