tree 9b13c1a610363de966f80be55ab865856f73e505
parent 2aa85161027f9d4e93df0ac1f40dfec0984c1653
parent 726c9271db8b976cf98da60b286e066000b55e28
author Jerry Zhang <zhangjerry@google.com> 1526499561 -0700
committer android-build-merger <android-build-merger@google.com> 1526499561 -0700

Merge "recovery: Refactor common setup into main()" into pi-dev-plus-aosp
am: 726c9271db

Change-Id: I8500833326fb5f4b64e8d9df721ff4335b407b09