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

Merge commit '609fef7173a1278cb79d7aefdd22a22547648cab' into gingerbread-plus-aosp

* commit '609fef7173a1278cb79d7aefdd22a22547648cab':
This commit is contained in:
The Android Open Source Project 2010-07-28 11:47:24 -07:00 committed by Android Git Automerger
commit 636e6dec48

Diff Content Not Available