am 636e6dec: am 609fef71: am 3a0576a4: merge from open-source froyo

Merge commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc'

* commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc':
This commit is contained in:
The Android Open Source Project 2010-07-28 11:48:46 -07:00 committed by Android Git Automerger
commit d12d7367db

Diff Content Not Available