tree a8c621b2347eefde22661ec5adeaa0a669c65ad3
parent 59274b47651d32059b1657b7183787c15fe92d64
parent 4360c29cf7fe2860b7b105720eb7a5dba2f2b7de
author Treehugger Robot <treehugger-gerrit@google.com> 1597723329 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597723329 +0000

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

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

Change-Id: I86a2c82568018023c427b2b8a505b636527db170