am 9901e38a: Merge change I7a39c564 into eclair

Merge commit '9901e38a962012d56accbc9b6259f9997bcd9c31' into eclair-plus-aosp

* commit '9901e38a962012d56accbc9b6259f9997bcd9c31':
  Fix docs error