tree f5059fbc8b63378fef786b5284e772a394049059
parent 7a0d2a251997b38b187e71ef20471815ed3df121
parent 8323ab407b5fee8e1f006a6f3f9b23f2b2cf740d
author Xiao Ma <xiaom@google.com> 1552454368 -0700
committer android-build-merger <android-build-merger@google.com> 1552454368 -0700

Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b am: d3c00327b9
am: 8323ab407b

Change-Id: Ib2b2474a74e2e84b3bb75c36b518ad48009065af