| commit | 87d984b0e4dfc1552ab58b48d9f0e76908fad256 | [log] [tgz] |
|---|---|---|
| author | KH Shi <kenghua@google.com> | Tue Dec 06 05:53:44 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 06 05:53:44 2022 +0000 |
| tree | 0ac9e145b9e385d6f2edbbdb144b245f4fad0cce | |
| parent | 29522fa52ac55e9b505dcfe2c41821df45bd0938 [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: Ie3cf3200769616888383d71b0bfbd76c621637e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>