tree d2c4da5f81ea1e3d94e4798138bb16fd17c31ac8
parent 629d0b5344e09b85da067af778248293c9516be8
parent e5f71e4ed0877bc1bafcd65c17bcc2971919cdaf
author Chalard Jean <jchalard@google.com> 1549466551 -0800
committer android-build-merger <android-build-merger@google.com> 1549466551 -0800

Merge "[KA04] Expose TCP socket keepalive API"
am: e5f71e4ed0

Change-Id: If8bc33ff30a529092802f9450a3772aaaa401c20