Merge change 6719 into donut
Android (Google) Code Review [Fri, 10 Jul 2009 20:43:13 +0000 (13:43 -0700)]
* changes:
  Fix bug #1873249i: Apps can DoS/brick device


Trivial merge