tree 32834661d97b84db76336bdfefc0204c9e710fd9
parent b079e7d408617bb8d8ecde488e77c885c806bb42
parent 6fb9316f6bd72b406bbfc61bd210281744eea9c1
author Nick Pelly <npelly@google.com> 1288807194 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288807194 -0700

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

* commit '6fb9316f6bd72b406bbfc61bd210281744eea9c1':
  Remove timeout support.