Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

This commit is contained in:
Xavier Ducrohet 2011-06-03 18:53:41 -07:00 committed by Android (Google) Code Review
commit df25902127

Diff Content Not Available