Merge "Squashed commit of the following:"

This commit is contained in:
Andreas Huber 2010-12-02 14:04:55 -08:00 committed by Android (Google) Code Review
commit 396b1b0254

Diff Content Not Available