| commit | 1ea8db2e78e0e4b15937116a2e05debc63f89ecc | [log] [tgz] |
|---|---|---|
| author | Nucca Chen <nuccachen@google.com> | Fri Jun 25 18:54:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 25 18:54:13 2021 +0000 |
| tree | 1bf91eda2e4edd4144a22f0dcdb71cb013cf599d | |
| parent | 77516cf64471502b453323af8523923e1c8d4ace [diff] | |
| parent | a729b103ff4f69585bf778949a6a153ae59c144b [diff] |
Merge "Refresh conntrack entry timeout" am: a569410667 am: a729b103ff Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871 Change-Id: I1c780860051e00658e5fd9764a5c5643160a09fd