am 2a7c5425: reconcile with open-source gingerbread

* commit '2a7c542594e37f61e25fec7f441eb0a8dc14fd62':
This commit is contained in:
Jean-Baptiste Queru
2010-12-10 08:49:47 -08:00
committed by Android Git Automerger

Diff Content Not Available