tree 9ec9654e6e0f01bde863be273e300ff91f5363b0
parent 3fd5d407a4f59abd19e8bb3476d090444f77943e
parent e9788bc36165633394e7fe9d920b95a1e8436677
author Tao Bao <tbao@google.com> 1568925119 -0700
committer android-build-merger <android-build-merger@google.com> 1568925119 -0700

Merge "recovery: Don't report unrecognized option in recovery_main." am: 785d0b4efa
am: e9788bc361

Change-Id: I4873bf08c5406a0e2270e2ee267a962b4f3164bf