| commit | 9404f82fbb75df568b6feb6f29e44bbe49c11d70 | [log] [tgz] |
|---|---|---|
| author | KH Shi <kenghua@google.com> | Tue Dec 06 05:51:32 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 06 05:51:32 2022 +0000 |
| tree | ea011d6edb4e480357fdbeb731689c1f86ced0b5 | |
| parent | 28bf20620ef68c6408360729d077c873ba7140d2 [diff] | |
| parent | cc8db2ac6e0173f10f206910861511db2c906f95 [diff] |
Merge "Fix ConntrackSocketTest#testIpv4ConntrackSocket flaky" am: cc8db2ac6e Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2264961 Change-Id: I3ac9a4774ac40ec524b68c6b8ac7b54008257c87 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>