Robert Greenwalt f268ed9cd9 Merge "Fix emulator dns."

2010-07-16 18:38:57 -07:00

..

android/telephony

am 4248d588: merge from open-source master

2010-07-16 13:46:08 -07:00

com/android/internal/telephony

Fix emulator dns.

2010-07-16 18:14:25 -07:00