Merge change 2358 into donut
Android (Google) Code Review [Fri, 29 May 2009 03:29:21 +0000 (20:29 -0700)]
* changes:
  Minimal set of changes needed to run with the modified frameworks/base.


Trivial merge