am 6fb9316f: am 38e561dd: Merge "Remove timeout support." into gingerbread

* commit '6fb9316f6bd72b406bbfc61bd210281744eea9c1':
  Remove timeout support.