am aab72e7c: am 4d484a82: Merge change 24700 into donut

Merge commit 'aab72e7c779856c0a844f6321501f8f42c1be9e3' into eclair-plus-aosp

* commit 'aab72e7c779856c0a844f6321501f8f42c1be9e3':
  docs only.