Merge "Squashed commit of the following:"

This commit is contained in:
Andreas Huber 2010-11-19 10:07:28 -08:00 committed by Android (Google) Code Review
commit c7e11f86e0

Diff Content Not Available