am ca203475: Merge change Ifcf20541 into eclair

Merge commit 'ca20347543797a67b48a369f9b901cecabd231e3' into eclair-plus-aosp

* commit 'ca20347543797a67b48a369f9b901cecabd231e3':
  New Javadoc for ContactsContract.