tree af0ecbebfbd6ea8f4f9943cea548ca06100044ea
parent 0f40992f50fe2e56b43eb95f14ccd8b4d4214bc2
parent a5898a4e851c56fb205025b14af2923c8b4954b6
author Tao Bao <tbao@google.com> 1568926059 -0700
committer android-build-merger <android-build-merger@google.com> 1568926059 -0700

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

Change-Id: I2bf94686d7403bbaa82ea59458c3e3a5d1d12c9f