Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp
* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
cherry-pick 288b4ac945 into froyo
Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp
* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
cherry-pick 288b4ac945 into froyo