Remi NGUYEN VAN 1ffe4ac727 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

2020-12-15 11:42:29 +00:00

..

android

Merge changes from topic "tcp_keepalive_fix" am: 3a86e4690e am: 559e7604e6 am: 2d843b4921

2020-12-15 11:42:29 +00:00

com/android

Merge "Generalize support for underlying networks." am: ca830d9239 am: 51c973d4b7 am: 2be66008a0

2020-12-14 06:40:27 +00:00