Merge commit '66e4691ad097cfc37bdb7d3b1705ee9132f3234e' into donut

This commit is contained in:
The Android Open Source Project 2009-06-02 16:39:12 -07:00
commit 47e234fa73

Diff content is not available