am fc618484: Merge from gingerbread
* commit 'fc618484abdca2f2378c1aa3dcbe1abe8a9a7f7f':
This commit is contained in:
committed by
Android Git Automerger
commit
6d0d6ef159