Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread

This commit is contained in:
Xavier Ducrohet 2011-02-28 12:24:01 -08:00 committed by Android (Google) Code Review
commit 13fbf42721

Diff Content Not Available