am 05f45f89: am 4895e726: Merge from gingerbread

* commit '05f45f89e367a82ca9bbb07f8f90e2635c9cad16':
This commit is contained in:
Jean-Baptiste Queru 2011-02-02 09:56:22 -08:00 committed by Android Git Automerger
commit bbedac04b0

Diff Content Not Available