Remi NGUYEN VAN 55ec25f835 Merge changes from topic "tcp_keepalive_fix" am: eada640d5d am: a0038ffa9d am: 66508a1e66
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
..
2020-12-14 22:58:12 -08:00