tree a8c621b2347eefde22661ec5adeaa0a669c65ad3
parent 40abfc5d4d0b3fe8e6c3e562b77a79e69db34b10
parent b5d418af521c6b08931f286dcec238f73d85c8aa
author Treehugger Robot <treehugger-gerrit@google.com> 1597722263 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597722263 +0000

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

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

Change-Id: I70131aeb3dd61b165c6671bf26f8e69e5381433d