Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread

This commit is contained in:
Xavier Ducrohet 2011-05-20 13:56:42 -07:00 committed by Android (Google) Code Review
commit e2ac5a6dfa

Diff Content Not Available