Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread

This commit is contained in:
James Dong 2011-01-14 16:27:48 -08:00 committed by Android (Google) Code Review
commit b1f1d0ede6

Diff Content Not Available