am 2145c46a: am 2562a40e: reconcile with open-source gingerbread

* commit '2145c46aa288c862ac3dce50877d16c0537bcea3':
This commit is contained in:
Jean-Baptiste Queru 2010-12-10 09:01:05 -08:00 committed by Android Git Automerger
commit 432b3a350a

Diff Content Not Available