Merge change 450 into donut
Android (Google) Code Review [Fri, 24 Apr 2009 00:24:53 +0000 (17:24 -0700)]
* changes:
  Re-apply fixes to the "SIM network unlock" UI (which were lost in the big CDMA merge)


Trivial merge