am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo

Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken

* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
  Support for customizable socket-read timeouts through the HTTP response.
tree: e3e1b775d2e5340dbfce10cfbdb606ef6fa8ad60
  1. camera/
  2. cmds/
  3. include/
  4. media/