Merge branch 'froyo' into froyo-release

This commit is contained in:
The Android Automerger 2010-06-11 11:47:09 -07:00
commit 8f6e4a2c97

Diff Content Not Available