am 8b637b9e: merge from froyo-plus-aosp

Merge commit '8b637b9eaba2c8cca671eb68286b4f3d0a071d20'

* commit '8b637b9eaba2c8cca671eb68286b4f3d0a071d20':
This commit is contained in:
The Android Open Source Project 2010-06-21 11:37:06 -07:00 committed by Android Git Automerger
commit 14be8526df

Diff Content Not Available