tree f49ad285eaebbb0c757575e1acd1dc2c5345b670
parent 221f4dda0a61d7c31cf48e580497aa69c95624c3
parent 5545b92c4ff8e25ba5c316a2af42920aa8093183
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582560843 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582560843 +0000

Merge "Ensure staged rollback status is logged on boot" into rvc-dev am: 025b96ee57 am: 414ad5cff8 am: 5545b92c4f

Change-Id: I7d846ee086d692013fd2093e3f12481ea9f423ee