| commit | 85900319d3805f647d621bc1ccb7179c11e411c0 | [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 | 7e2bd9f2e17e57ea49c3beee0272c53d2cbb8fef [diff] | |
| parent | 90879a2689eac6678cfe2f6104725a7e93e10b61 [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