tree 65fbe4882887f69bc6089c87467c75807a662a16
parent ca44dc4aa42d328613e037db435a781b2016671e
parent bca2ceb7a70d238549b7687a39f9584fb02b4b85
author Tao Bao <tbao@google.com> 1555625424 -0700
committer android-build-merger <android-build-merger@google.com> 1555625424 -0700

Merge "Allow entering rescue mode via recovery UI." am: b951138ebe
am: bca2ceb7a7

Change-Id: I0551d7fa0cfd8fa7c8d1ce6e4447e99a584e4c1e