| commit | 2791e3fe11d8ebfdd17368a8a8307a37d3028dec | [log] [tgz] |
|---|---|---|
| author | Nucca Chen <nuccachen@google.com> | Fri Jun 25 18:55:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 25 18:55:47 2021 +0000 |
| tree | b75dcf8d18a1253654ce51595bfca5235c48c542 | |
| parent | 8516b3f12056b8f3d6958dd8c90425a58f725b92 [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: I5508b5b47d17c01d2ce95fb30d9dfc14e279f932