Merge change 26315 into eclair

* changes:
  VpnService: use Credentials instead of CertTool.
tree: 815addd72c2cd40e21222e929001c11d48dd66db
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE