Merge "WifiManager.getCountryCode(): Change permission to NETWORK_SETTINGS" into rvc-dev am: 26db1f9278 am: c696aca6be
Change-Id: I47c443a4145ad41d06808c327ca42697a5d53f63
This commit is contained in: