tree 37f725d77d5dfa3e8e69f8a0ff298d302cefb584
parent f65bc1823a8c09caab8237bf96323cf05df02287
parent cd419cf89c552479bd382e3e0c554c84375f85f9
author Scott Main <smain@google.com> 1252637497 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252637497 -0700

am cd419cf8: Merge change 24641 into donut

Merge commit 'cd419cf89c552479bd382e3e0c554c84375f85f9' into eclair

* commit 'cd419cf89c552479bd382e3e0c554c84375f85f9':
  docs only.