tree 2b1ed6191504dd394bb196cd5bb0aed0a98fc2f4
parent 52635f5259928489e38a7e7e9fcaf031fea57881
parent 29c969086430d1ff01da18f91adbbee22369ebba
author Tao Bao <tbao@google.com> 1524871202 -0700
committer android-build-merger <android-build-merger@google.com> 1524871202 -0700

Merge "recovery: Revoke (most of) short options." am: 3de3756081
am: 29c9690864

Change-Id: I25522cc339a561129e3a933c1c1c8a13e2caf44a