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