| commit | 1ffe4ac7278c8940dc1eb05c33b975b65a0772a7 | [log] [tgz] |
|---|---|---|
| author | Remi NGUYEN VAN <reminv@google.com> | Tue Dec 15 11:42:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 15 11:42:29 2020 +0000 |
| tree | e675acb0bd9e9690be46f54fdbccfc94d898c8db | |
| parent | 6ebd98efc16eeea96d627a1f2ffc5cadc867fab0 [diff] | |
| parent | 2d843b4921c5a12e98daf777241ee2ea1e4d9662 [diff] |
Merge changes from topic "tcp_keepalive_fix" am: 3a86e4690e am: 559e7604e6 am: 2d843b4921 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26fa0ae4a1f41f1b970f6f7b192dfc4fe4bedb1d