am 9b9c61f6: am 2a7c5425: reconcile with open-source gingerbread

* commit '9b9c61f6154cfb39c280837698da5834714cab90':
This commit is contained in:
Jean-Baptiste Queru
2010-12-10 08:54:09 -08:00
committed by Android Git Automerger

Diff Content Not Available