tree cb2b3c5d809ff7c0c712464e4598d25e8809b2f3
parent a1103f336d01d0a5dcb07afc89cd1bc7ec0ece69
parent 79253f8b4223976c010e52a34e8785648c8fb074
author Scott Main <smain@google.com> 1252686746 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252686746 -0700

am 79253f8b: Merge change 24690 into donut

Merge commit '79253f8b4223976c010e52a34e8785648c8fb074' into eclair

* commit '79253f8b4223976c010e52a34e8785648c8fb074':
  docs only.