am 483d29c0: am 671c61d6: Merge change Iaf5d2cc2 into eclair-sdk

Merge commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4' into eclair-plus-aosp

* commit '483d29c0ddc9f4c110a8a8788ccd978010d55aa4':
  doc change: misc doc fixes.