am 82da01d6: Merge from gingerbread

* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':
This commit is contained in:
Jean-Baptiste Queru 2011-06-01 14:23:11 -07:00 committed by Android Git Automerger
commit 6ebedf0053

Diff content is not available