am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit '6ebedf0053ccefd414e5887db316f84bd8f6c44c':
This commit is contained in:
Jean-Baptiste Queru
2011-06-07 13:23:26 -07:00
committed by Android Git Automerger

Diff Content Not Available