tree 18b47f2271406266e617c8dda39a8950882b9f8b
parent f92a53fadbb806383fef6575166224ea478ce1e8
parent 977234aba234501c7fdb313f69812885eed6f025
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: a8f21187be am: c2d9d5e588 am: 977234aba2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1494039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26fa0ae4a1f41f1b970f6f7b192dfc4fe4bedb1d