am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be...
am 8b8a8f65: am a7c76d83: Merge "fix a bug where timeouts would only be handled when a message was delivered" into gingerbread
Merge commit '8b8a8f65'
* commit '8b8a8f65':
fix a bug where timeouts would only be handled when a message was delivered