Cherry-pick 78bc8a3d70c65973fed80ee5cb628f7aa21e14d0 into
the Froyo branch.
1 file changed