Merge change 1703 into donut
Android (Google) Code Review [Fri, 15 May 2009 00:38:32 +0000 (17:38 -0700)]
* changes:
  findbugs fixit: Clean up a few more (fairly minor) findbugs complaints.


Trivial merge