manual merge of 7ec32cc

Merge commit '7ec32cc'
This commit is contained in:
The Android Open Source Project 2009-05-08 07:21:43 -07:00
commit bc1b1cc401

Diff Content Not Available