Merge "Merge from gingerbread-plus-aosp"

This commit is contained in:
Jean-Baptiste Queru 2010-12-06 14:21:07 -08:00 committed by Android (Google) Code Review
commit 02bf8be47f

Diff Content Not Available