am db71bda6: Merge from gingerbread

* commit 'db71bda6f696aff6047e6c26c32e0c08bf6851bc':
This commit is contained in:
Jean-Baptiste Queru
2011-02-03 15:24:24 -08:00
committed by Android Git Automerger

Diff Content Not Available