tree 54e7279c7942fd9df5ec4fb0b504779e2568963e
parent 104798b706370c1bf403a1d07a0d69a740a3fb2f
parent b7e029d03c115ed65cdea9b2bba307e882c308e2
author Jaikumar Ganesh <jaikumar@google.com> 1268182596 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1268182596 -0800

Merge "Add an API to set the link timeout."