am 232bc085: am 708e4251: Merge "Revert the ANSWERING state." into gingerbread

Merge commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7'

* commit '232bc085fc901b6234d47c4ee4e3ee4fc88431e7':
  Revert the ANSWERING state.
tree: ec4e1fe7ceb1ade1ee4dde94bac31bca50cb04cb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE