am 05059b5b: am 8226140c: Merge from gingerbread

* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
This commit is contained in:
Jean-Baptiste Queru
2011-02-02 09:56:30 -08:00
committed by Android Git Automerger

Diff Content Not Available