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