am f6b2beaa: am 05059b5b: am 8226140c: Merge from gingerbread

* commit 'f6b2beaabda6607b1c60dccaff038e9b59733821':
This commit is contained in:
Jean-Baptiste Queru
2011-02-02 10:00:00 -08:00
committed by Android Git Automerger

Diff Content Not Available