tree ceb1f2b9782fe6be040a97bcb9cc92b25667b590
parent 0cd00c21beef41a0ae692917daef7b9cba569a0f
parent 2bc65f82f6a4a9c10502fac4c86498ff3f0cbd41
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584228449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584228449 +0000

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

Change-Id: Ife73c5e0d55f75169cdc430877cb3297e29ebb2c