am 375afcd5: am 4b8ad9ef: Merge from gingerbread

* commit '375afcd5d69f47c85960270bf51b83a2b768d446':
This commit is contained in:
Jean-Baptiste Queru
2011-02-03 13:32:08 -08:00
committed by Android Git Automerger

Diff Content Not Available