am 389cdb7a: Merge change 26258 into eclair

Merge commit '389cdb7ab60182292fe383bc1c29d7b77ca5a893' into eclair-plus-aosp

* commit '389cdb7ab60182292fe383bc1c29d7b77ca5a893':
  docs only.