am 9ae00645: Merge change 26280 into eclair

Merge commit '9ae0064588a6f922834c8998ef91f04a0d19b1cc' into eclair-plus-aosp

* commit '9ae0064588a6f922834c8998ef91f04a0d19b1cc':
  Another doc update.