am 636e6dec: am 609fef71: am 3a0576a4: merge from open-source froyo
Merge commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc' * commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc':
This commit is contained in:
commit
d12d7367db
Merge commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc' * commit '636e6dec481cda18eb4fa5c4f0338d80ecee81cc':