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

Merge commit '708e42512a8b14202cd872d96d1f071ccb4cf915' into gingerbread-plus-aosp

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