Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread

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

Diff Content Not Available