Merge change 533 into donut
Android (Google) Code Review [Sat, 25 Apr 2009 00:15:12 +0000 (17:15 -0700)]
* changes:
  Teleca 090414 & 090423 patches for CDMA to complete phase1 work.


Trivial merge