Merge "Introduce a seam to ConnectivityManager and TelephonyManager" into gingerbread
Steve Howard [Mon, 19 Jul 2010 17:58:58 +0000 (10:58 -0700)]

Trivial merge