am fc618484: Merge from gingerbread

* commit 'fc618484abdca2f2378c1aa3dcbe1abe8a9a7f7f':
This commit is contained in:
Jean-Baptiste Queru
2011-06-01 14:26:31 -07:00
committed by Android Git Automerger

Diff Content Not Available