am 4895e726: Merge from gingerbread

* commit '4895e726ee66978dc24c618917e86b2930fe9bdf':
This commit is contained in:
Jean-Baptiste Queru 2011-02-02 09:53:24 -08:00 committed by Android Git Automerger
commit 05f45f89e3

Diff Content Not Available