tree 1957b092f2758c195a6922ac2e20e0dcd2ab9376
parent b32c1dd2edc70c8fc78e62e62d50e6260d2f4bde
parent ee2b4024bfe5147c860699399037db9ca8f38911
author Tao Bao <tbao@google.com> 1556576559 -0700
committer android-build-merger <android-build-merger@google.com> 1556576559 -0700

[automerger skipped] Allow entering rescue mode via recovery UI. am: 378bfbfc5c -s ours
am: ee2b4024bf -s ours
am skip reason: change_id I913dbdbcffd3179e6fa72ca862f74ca8f1364b02 with SHA1 c6dc325e88 is in history

Change-Id: I09fa15cb768674ba4a36a26a72b58421a653ee26