tree c927227a33bd0c156326dd91e0b79b6a9b9185f5
parent 3d9de410e4bc3581357b128859f53ff9828e257a
parent 7f269b07c1360f3655225a10dcb7fce9999ddbce
author Treehugger Robot <treehugger-gerrit@google.com> 1597724103 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597724103 +0000

Merge "Return the correct action for PromptAndWait" am: 99277fa6af am: c55e7fd95d am: b5d418af52 am: 4360c29cf7 am: 7f269b07c1

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

Change-Id: I1c611157b4c31957cf873ed3390f38f9d759499e