Merge branch 'froyo' into froyo-release

This commit is contained in:
The Android Automerger
2010-06-14 14:00:37 -07:00