commit | ba9d45f792337497f76a7c9ae7f8cfd49315f316 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Thu Oct 24 02:53:51 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 24 02:53:51 2019 -0700 |
tree | 6af588de58f28024f9e19b224945ecf9c4a16c82 | |
parent | 371e2a500aafa14637b803ed29030afb3050c2e0 [diff] | |
parent | d2b77dc01c7dc7c458b1c32c881b1d434b3195fb [diff] |
Merge "Set keepalive socket timeout to default value" am: 4c8baa10f9 am: 8d03ba0e98 am: d2b77dc01c Change-Id: I37be1fdee14d9cc5f5c12fa7474b003130840ad6