| commit | 9a28560ec6d4c322ad9bcde289f8f8a26f69d682 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Tue May 01 11:19:10 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 01 11:19:10 2018 -0700 |
| tree | aed13ef5811e7844f128f44b7f830fa2aacb5f86 | |
| parent | 97d757fbfcadbc9f3be87e6192812e0983741701 [diff] | |
| parent | 9fa43507ef37b0a907e14cd4e94a70083a21af2c [diff] |
[automerger skipped] Merge "recovery: Split main() into recovery_main.cpp." am: 0204e88073 am: 17f6c1b041 -s ours am: 9fa43507ef -s ours Change-Id: I2c4296f41a5fa7f8f2ca8cc44134075aae3f5ff1