Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp * commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7': Re-hide the contacts APIs, the droiddoc build is failing.
Merge commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7' into eclair-plus-aosp * commit '0c23212ebdfbe008aca95d2ace2e52ca0a0b7ec7': Re-hide the contacts APIs, the droiddoc build is failing.