tree a8c621b2347eefde22661ec5adeaa0a669c65ad3
parent 435f3d3f16c27678fcd0ddd01efd2092208bce1a
parent c55e7fd95decbe41ca18f7a4d36df110e7cbd165
author Treehugger Robot <treehugger-gerrit@google.com> 1597721603 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597721603 +0000

Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1398888

Change-Id: Ie2d0b0dc1d5f6383fac4142cab4391816a419ab1