Merge change Ie80e2381 into eclair

* changes:
  DO NOT MERGE: Squashed commit of the following:
This commit is contained in:
Android (Google) Code Review 2009-11-05 16:50:34 -05:00
commit cc4a63efab

Diff Content Not Available