Skip to content
Commit 66508a1e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge changes from topic "tcp_keepalive_fix" am: eada640d am: a0038ffa 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idedfa2e8237109824683a9923079b02835c39acc
parents 40190840 a0038ffa
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment