Merge change I74bf38a0 into eclair-mr2

* changes:
  Squashed commit of the following:
This commit is contained in:
Android (Google) Code Review 2009-12-03 13:27:08 -08:00
commit 04427e50a7

Diff Content Not Available