tree a988780e4b345d4d27cf2ae5ddacb38012cddab5
parent 70504b2f6bc368c380cf13ab346def7813d88cf4
parent a569410667e658a27569e3722ce99d4fda259046
author Nucca Chen <nuccachen@google.com> 1624646723 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624646723 +0000

Merge "Refresh conntrack entry timeout" am: a569410667

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871

Change-Id: I13894c11c848b85d4647ffecb359420421839896