OSDN Git Service

am 32ac2100: am f0fed9dc: am b3735744: Merge change I40dd2cfc into eclair
authorAmith Yamasani <yamasani@google.com>
Mon, 26 Oct 2009 21:33:44 +0000 (14:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Oct 2009 21:33:44 +0000 (14:33 -0700)
commit43745f0ae53d7e0d588913d7ec59508c02a1ff9a
tree485cbb3dee583dc70035fd852ea531e291ca7a33
parent380b40bf6fadb3f4d574a4f35ccda9fb211cbaf5
parent32ac210016615fa6f0ee43ad5ffbc6d68ce75fab
am 32ac2100: am f0fed9dc: am b3735744: Merge change I40dd2cfc into eclair

Merge commit '32ac210016615fa6f0ee43ad5ffbc6d68ce75fab'

* commit '32ac210016615fa6f0ee43ad5ffbc6d68ce75fab':
  Fix for 2202408: Replace Never Timeout with 30 minutes