Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp * commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e': doc change: misc doc fixes.
Merge commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e' into eclair-mr2-plus-aosp * commit '21cbd52b7acb8f3fbcbd256a62f27f1476e9c89e': doc change: misc doc fixes.