Android (Google) Code Review 35eea54a40 Merge change 6935 into donut ...

* changes:
  DO NOT MERGE: backporting from master:

2009-07-13 15:44:57 -07:00

..

android/telephony

Merge change 6935 into donut

2009-07-13 15:44:57 -07:00

com/android/internal/telephony

Merge change 6935 into donut

2009-07-13 15:44:57 -07:00