am e02f4f12: am c2d3fc2c: Merge change 22323 into donut

Merge commit 'e02f4f1274ac166a1d314e44b586c31febaf56a7' into eclair-plus-aosp

* commit 'e02f4f1274ac166a1d314e44b586c31febaf56a7':
  docs only.