tree feb188cedd5c42884bcbeda6e7be44c26e0b4fb2
parent 50af4ecd0e44c81e05429c7746b095ec1a6b1b31
parent de8e51866858316310f13eba27cce363c082871b
author Treehugger Robot <treehugger-gerrit@google.com> 1597725014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597725014 +0000

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

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

Change-Id: I2c887d06b47949369159f160aa01c3c4c807bc85