tree a999c893050ec56e0adae1e1f14af516bf2cebc4
parent 7240fd9ea15b439a4283d3451a776328d83bc59c
parent 559e7604e6c7ce0125a1371d41f8bda96e9c28b6
author Remi NGUYEN VAN <reminv@google.com> 1608027803 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1608027803 +0000

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idedfa2e8237109824683a9923079b02835c39acc