tree 7d7c15b93f5306a8d36225aa0501ba58621d484f
parent 495a394fd375f673829f4c8e47e4bb05f33afcc7
parent 47c08de2d2081fbb54fd1ab48f2e0ec7ab0de4f5
author Yifan Hong <elsk@google.com> 1585595571 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1585595571 +0000

Merge changes from topic "fdr_merge" into rvc-dev

* changes:
  libsnapshot: Allow forward merge on FDR
  libsnapshot: Place forward merge indicator for wipe
  libsnapshot: Add allow-forward-merge indicator.
  libsnapshot: Fix DataWipeAfterRollback test
  libsnapshot: Fix intermittent test failure due to missing null check.
  libsnapshot: dump rollback indicator