tree a7920795f9e32e96941ff1c7ff91a2b658e2a547
parent aaed596cedd0643b70d5755a43be681e5c168818
parent e79aebe927dbf00a1011feb267b4fe4154837c02
author Robin Thellend <rthellend@google.com> 1424408641 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1424408641 +0000

Merge "veyron/lib/websocket|veyron/runtimes/google/ipc: Set KeepAlive in Dialers and Listeners"