Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread

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

Diff Content Not Available