| commit | 0e051700785214e28799dfc0a113de5bdde96fea | [log] [tgz] |
|---|---|---|
| author | David Anderson <dvander@google.com> | Fri Aug 25 18:24:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 25 18:24:36 2023 +0000 |
| tree | f49d449b18c2df641fe9e5668656df2794ea28fe | |
| parent | b6aef064fc81e9921ed4d4f108e642dc27d93581 [diff] | |
| parent | d17c3ebb40d510d7c326457396094c44a2059123 [diff] |
Merge "snapuserd: Fix race condition in MergeWorker::WaitForMergeBegin." into main am: c718295a58 am: 9077049910 am: d17c3ebb40 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2701653 Change-Id: If8d65e1284c8d0700cd7d3531922c1327ad4f6ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>