am ca203475: Merge change Ifcf20541 into eclair

Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-mr2

* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
  New Javadoc for ContactsContract.
tree: b04208a3e7330bfe0e7e951a2e5b4dbb59c55bbc
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE