tree 7875495d474cfe45afa2a32aed483c3d23be26e9
parent 5b0d063010b364102ffb7a533e2b76ecfd9636d5
parent a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c
author Mathias Agopian <mathias@google.com> 1286826263 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286826263 -0700

am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread

Merge commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c' into gingerbread-plus-aosp

* commit 'a7c76d8307a3b49bf5b8fdda3543455b0e5dd64c':
  fix a bug where timeouts would only be handled when a message was delivered