tree 2b1ed6191504dd394bb196cd5bb0aed0a98fc2f4
parent 1409bf79e377eb36b56c865a2996d034345dd87a
parent 5d096631aca8fb7059f585bfde313bdb694bc76f
author Tao Bao <tbao@google.com> 1524871473 -0700
committer android-build-merger <android-build-merger@google.com> 1524871473 -0700

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

Change-Id: Ia35b206ff6f1733041d1bdcc751756694661cd18