tree 76128f6c17d4ee4302996a85784938b0458880d0
parent 40351ecec878910d7f0ac6988cd8010dc82b0a99
parent 890175db1f425cb92365cc7941c6c64544b2c164
author Scott Main <smain@google.com> 1252686739 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252686739 -0700

am 890175db: Merge change 24574 into donut

Merge commit '890175db1f425cb92365cc7941c6c64544b2c164' into eclair

* commit '890175db1f425cb92365cc7941c6c64544b2c164':
  docs only.