tree 9c61709deac3a727ef109d3734903446d22a0f72
parent 74538db6848e1a315923ec765436b62eb3147537
parent 99277fa6afbb416d9428c3931bd1230c9e78cc15
author Treehugger Robot <treehugger-gerrit@google.com> 1597720632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597720632 +0000

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

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

Change-Id: I8b8a07f433aa34cd29de401f3137c6992812dc20