tree af6f5541e323673c051ade21bd41228216b885cc
parent 567570954e41a965fa8a82cf9908ff6eef580a84
parent 0abc18d5202d6d31fb2b85bf05f7be5394ea45ee
author Tao Bao <tbao@google.com> 1526515415 -0700
committer android-build-merger <android-build-merger@google.com> 1526515415 -0700

[automerger skipped] Merge "recovery: Refactor common setup into main()" am: 5b3d6cf58b
am: 0abc18d520  -s ours

Change-Id: I6e90e6810feefaa7b6b028259591e5cced2b5c3f