| commit | dd620ccf24ff4ca25c1cec6b387cb085ab5a8035 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Thu Jan 06 02:26:08 2022 +0000 |
| committer | David Anderson <dvander@google.com> | Thu Jan 06 04:32:39 2022 +0000 |
| tree | 54d1e3e7315f7de65c30ec8cc43f21f375fff3e7 | |
| parent | e3f4b844681af6673f377855f22fe0fc1345799b [diff] |
libsnapshot: Fix CHECK failure during second phase merge This CHECK prevents a release build from resuming a two-phase merge if the merge initially failed in the first pass. Bug: 213031779 Test: vts_libsnapshot_test Test: update_engine_unittests Change-Id: I8bf00e3016546ef7039bb0b18eb977cc3dc1066a