Merge "CherryPick 988eeeb5 from hc-mr1. do not merge." into gingerbread

This commit is contained in:
Xavier Ducrohet 2011-06-28 18:52:59 -07:00 committed by Android (Google) Code Review
commit 75d0ba1869

Diff Content Not Available