[automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b
am: 0abc18d520
-s ours
Change-Id: I6e90e6810feefaa7b6b028259591e5cced2b5c3f
This commit is contained in:
commit
41e47d6d0a