Wink Saville db9f06d9c4 resolved conflicts for merge of 2a1e9641 to eclair-mr2 ...

Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659

2009-11-12 22:44:11 -08:00

..

android/telephony

Fix test breakage in Zaku. Modification to PhoneNumberUtils included.

2009-10-29 11:01:07 +09:00

com/android/internal/telephony

resolved conflicts for merge of 2a1e9641 to eclair-mr2

2009-11-12 22:44:11 -08:00