am 58e49a50: Merge " ConnectivityManagerTestActivity can be launched from launcher.  Help to track bug 2680352.  Add a resource file for string.  Corrent some typos." into kraken