tree 0ca7967a9341ef5aa58820c27f33a31647c31d8c
parent 7027a5fb1296f5d995dd77fdd3e9fdbf54373277
parent 6c9f2acda0e30c383885a00a9d0b819a948b4da0
author Tianjie Xu <xunchang@google.com> 1556561182 -0700
committer android-build-merger <android-build-merger@google.com> 1556561182 -0700

Merge "Support wipe command in rescue mode" am: 8fc8f39b62
am: 6c9f2acda0

Change-Id: I2b3502cf90f62d6c0c7d223d69cb9e403de4b814