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
tree: d0f9cd06c9da12a52a9e6f2311a9b4eaa9e5c497
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE