| commit | 5d4ed0240af0fba67544b7bfea5a45d87796cc15 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Mon Mar 30 19:12:51 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 30 19:12:51 2020 +0000 |
| tree | 7d7c15b93f5306a8d36225aa0501ba58621d484f | |
| parent | 495a394fd375f673829f4c8e47e4bb05f33afcc7 [diff] | |
| parent | 47c08de2d2081fbb54fd1ab48f2e0ec7ab0de4f5 [diff] |
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