am 2562a40e: reconcile with open-source gingerbread

* commit '2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':
This commit is contained in:
Jean-Baptiste Queru 2010-12-10 08:58:22 -08:00 committed by Android Git Automerger
commit 2145c46aa2

Diff content is not available