Merge "Merge from gingerbread-plus-aosp"

This commit is contained in:
Jean-Baptiste Queru 2010-12-06 14:33:03 -08:00 committed by Android (Google) Code Review
commit 86705c7804

Diff Content Not Available