| commit | 739f4f5f609846f11072ec5e0a45fdd8c4225e29 | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Thu Jan 06 02:26:08 2022 +0000 |
| committer | David Anderson <dvander@google.com> | Fri Jan 07 02:36:11 2022 +0000 |
| tree | 11fa4fb4ab776de1a5eb95212017b3e223f5466c | |
| parent | 6834fe66d7995b4016dcaa652c847f1948cf1571 [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 Bug: 213253413 Bug: 193549218 Ignore-AOSP-First: cherry-pick from AOSP Test: vts_libsnapshot_test Test: update_engine_unittests Change-Id: I8bf00e3016546ef7039bb0b18eb977cc3dc1066a Merged-In: I8bf00e3016546ef7039bb0b18eb977cc3dc1066a