tree c15d6fd62ec912e782227c6ad406955ed6709a57
parent 14d3f78851ac1897b5baa2ea57e8c2d89b019aa8
parent 66508a1e66bd772e8ca816615c433ed30a9a55e1
author Remi NGUYEN VAN <reminv@google.com> 1608032549 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608032549 +0000

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