Merge "Squashed commit of the following:"

This commit is contained in:
Andreas Huber 2010-12-21 10:47:34 -08:00 committed by Android (Google) Code Review
commit 5926d0efd9

Diff Content Not Available