am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread

* commit '236afa6806c384a235782cde820a7f01de9e1b82':
This commit is contained in:
Jean-Baptiste Queru
2011-02-03 13:34:41 -08:00
committed by Android Git Automerger

Diff Content Not Available