tree b9b766a1ce506e0ce542c2af7d33fb1932a35e2c
parent 2feb47a29b19f950e6633301c78ec828ac88585f
author Yifan Hong <elsk@google.com> 1568761824 -0700
committer Yifan Hong <elsk@google.com> 1569289812 -0700

snapshotctl: merge when boot

Test: reboot after OTA on virtual A/B device, see merge
Bug: 135752105

Change-Id: I92eb8d0961635008366c336ead40e3038173257f