am 6962aff3: am 698ddb0c: Merge "Fix links in SIP API javadoc." into gingerbread

Merge commit '6962aff36be9d91ad40ead326bd54fc90965f6f0'

* commit '6962aff36be9d91ad40ead326bd54fc90965f6f0':
  Fix links in SIP API javadoc.
tree: 247e2d025033d62db7eece1eb089109dd36e382f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE