tree 8651cb90295a8fa07e968c8e584e72f1b9d2a104
parent a233cb1261bf7462164fd041f57b8cc1e3dd949d
parent a69c69b26f3dce9bac5b32f3c8f7c6c7115a0de7
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584226465 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584226465 +0000

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

Change-Id: I62b55862a49b460a734d0d1d4e5d46a572fb0abb