Android (Google) Code Review c39aae0ee0 Merge change 1278 into donut
* changes:
  Squashed commit of the following:
2009-05-08 14:46:41 -07:00
..