Merge "Stop using the sim mnc/mcc to set wifi country." into klp-dev
Robert Greenwalt [Mon, 30 Sep 2013 21:13:37 +0000 (21:13 +0000)]

Trivial merge