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