am f84b2524: am 6ebedf00: am 82da01d6: Merge from gingerbread

* commit 'f84b25243d7ebeaca8424171f5ca3b192cc76d80':
This commit is contained in:
Jean-Baptiste Queru 2011-06-08 14:47:00 -07:00 committed by Android Git Automerger
commit 5a4e03d120

Diff Content Not Available