tree 4cfd9282d64381824c5a94eae093595468bff55a
parent 86917696c4455139e5becf6502af79207edd8a4f
parent 329f5ca7f7031ec552ee6c6204d0205774d8354d
author Chung-yih Wang <cywang@google.com> 1284011250 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284011250 -0700

am b2118252: am 4d1e0121: Change the keep-alive interval to 10 seconds.

Merge commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69'

* commit 'b2118252545f4b3ab43ffb2cda4b956f8f85ff69':
  Change the keep-alive interval to 10 seconds.