tree df641c5c57ecc731c6d3d78797ed80e7e7786042
parent 18dbf7ed00ca0adbfc57b66196248f47f151937c
parent 4aa53f30aea967d4d326a0383bb19764dcf687dd
author Suharsh Sivakumar <suharshs@google.com> 1455086787 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1455086787 +0000

Merge "js.core: Introduce options.ConnectionTimeout and remove options.RetryTimeout."