resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp

Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986
This commit is contained in:
Gilles Debunne 2011-02-08 16:33:58 -08:00
commit a8b288d285

Diff Content Not Available