am 773dc43c: am b5bf09a5: Merge "Allow more time for HttpPost watchdog timeout" into froyo

Merge commit '773dc43cc2caf7638c610ac85711eed89a06efa5' into kraken

* commit '773dc43cc2caf7638c610ac85711eed89a06efa5':
  Allow more time for HttpPost watchdog timeout