Robert Greenwalt d9212d3088 resolved conflicts for merge of 8550f3b8 to master ...

Change-Id: If2881b8b7faea5139af83a37cba04ccac5904f81

2011-07-15 10:52:54 -07:00

..

android/telephony

Merge "Remove explicit toUpperCase after CountryDetector is fixed to return uppercase region code."

2011-07-01 13:19:37 -07:00

com/android/internal/telephony

resolved conflicts for merge of 8550f3b8 to master

2011-07-15 10:52:54 -07:00