tree 6a2c7c5d79a986548819acfeb626a570ca1e3e78
parent 0c592acfc0ea298a0cf6c049cce4c5c10974e911
parent 4d1e0121277b566b5e1c22e790a3b607b75d945d
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.