tree aed13ef5811e7844f128f44b7f830fa2aacb5f86
parent 2ac56afc7b3df1989f164b18d24295422a020788
parent 17f6c1b041458ad66cf11d3e0d84acd4f60321a5
author Tao Bao <tbao@google.com> 1525198187 -0700
committer android-build-merger <android-build-merger@google.com> 1525198187 -0700

[automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073
am: 17f6c1b041  -s ours

Change-Id: I86f2a84affaf0d03be0431d35d265767b1ba68c1