tree cc6b80bb25b9227d561b02dd34714722df731f08
parent 461e6ee7e43f6a91265616357af717097be57a49
parent 737a2e41bde4581bbbe12c3f54eed4d55d15c7e6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584227081 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584227081 +0000

Merge "Consolidate the wait in recovery's reboot" am: a69c69b26f am: 737a2e41bd

Change-Id: I31c2402def47126ba364ef44b9c2fe5effc3ca94