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.
This commit is contained in:
Chung-yih Wang 2010-09-08 22:47:30 -07:00 committed by Android Git Automerger
commit bf88cdf13e

Diff Content Not Available