| commit | a98ecc48eef65f3e0717742da7e256f28468fc7d | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Fri Aug 25 19:13:33 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 25 19:13:33 2023 +0000 |
| tree | ad3b2afb45f8e6fb9b932491117158ef3d6d5327 | |
| parent | 33012bc5ceb87854d3e0afa8d70aafd095beac38 [diff] | |
| parent | 95b3d2e69ad259f769ef4f80914034d3fc5281db [diff] |
Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main am: c718295a58 am: 9077049910 am: d17c3ebb40 am: 0e05170078 am: 95b3d2e69a Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701653 Change-Id: I42afb645d59cf31019df4df125e226faa77b1fe3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>