am a1103f33: am 890175db: Merge change 24574 into donut

Merge commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69' into eclair-plus-aosp

* commit 'a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69':
  docs only.