| commit | 582520615d4745da6d8a5f2d51091148c400b7de | [log] [tgz] |
|---|---|---|
| author | KH Shi <kenghua@google.com> | Tue Dec 06 06:24:47 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 06 06:24:47 2022 +0000 |
| tree | c295f974683172810bf197aa9c7b0d060ab58094 | |
| parent | d7f5203dc7746dfb92d8d2662019656710b9f15f [diff] | |
| parent | 87d984b0e4dfc1552ab58b48d9f0e76908fad256 [diff] |
Merge "Fix ConntrackSocketTest#testIpv4ConntrackSocket flaky" am: cc8db2ac6e am: 87d984b0e4 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2264961 Change-Id: Id2b7e35628fd2450ca94fd4a3d31394a59101403 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>