tree af6f5541e323673c051ade21bd41228216b885cc
parent cd4122f122067b1196ecac501a13ed51f48e93f2
parent 41e47d6d0af2011c316629a5e5661f911439fa19
author Tao Bao <tbao@google.com> 1526516962 -0700
committer android-build-merger <android-build-merger@google.com> 1526516962 -0700

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

Change-Id: Ifecfe86247c683366ede6a2d9e91b2c51990a1de