Merge change I89c40f50 into eclair

* changes:
  fix a javadoc build breakage
tree: e101cea80b6258fa478b702cfef622747f3f9e39
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE