tree f4807a1d5e169667b00547b9554287ee43bd12c4
parent 32289ba3739242de0b6ca7c0dd154f40244714db
parent 52383c1d6b76a0b8123054bb66c407adc76ece1d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582561492 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582561492 +0000

Merge "Merge "Ensure staged rollback status is logged on boot" into rvc-dev am: 025b96ee57 am: 0271248808" into rvc-d1-dev-plus-aosp am: f921dbd526 am: 52383c1d6b

Change-Id: I7c132a51f2fbedb99afd32df7e3e5fb1b6a6309e