Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
tree: 64ae2fa639ef501ef1b6b8e1195020dc80aab53c
  1. camera/
  2. cmds/
  3. include/
  4. media/