tree eed30068eabef368184db5d7854b914a684bf35c
parent 7a971c0e9a97784dc5887142307a4e4f3196697b
parent b1ef9664ada21330249b82611f72a8e10cf607c6
author Chung-yih Wang <cywang@google.com> 1284010972 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284010972 -0700

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

Merge commit '4d1e0121277b566b5e1c22e790a3b607b75d945d' into gingerbread-plus-aosp

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