Merge change 1570 into donut
Android (Google) Code Review [Thu, 14 May 2009 21:20:49 +0000 (14:20 -0700)]
* changes:
  Fix bad use of "==" with Strings.


Trivial merge