Robert Greenwalt a8e0dfae06 resolved conflicts for merge of db46fa25 to master ...

Change-Id: I8df9d5d07588fbd70e417dae567be26f645b74b6

2011-05-02 14:41:57 -07:00

..

android/telephony

am 520dd927: am 9355a24a: Merge "Fixing wrong Japanese phone formatter."

2011-04-29 17:15:13 -07:00

com/android/internal/telephony

resolved conflicts for merge of db46fa25 to master

2011-05-02 14:41:57 -07:00