am 40f3271c: More doc changes.

Merge commit '40f3271c2dd386878c9a180462c75c890913e9b4' into eclair-plus-aosp

* commit '40f3271c2dd386878c9a180462c75c890913e9b4':
  More doc changes.