Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'

Change-Id: I6c9de433a224925961b484b400a89edf9059d2bd
This commit is contained in:
Vinit Deshpande
2015-03-16 00:55:25 -07:00
17 changed files with 506 additions and 38 deletions

View File

@@ -112,6 +112,7 @@ import com.android.settings.wifi.AdvancedWifiSettings;
import com.android.settings.wifi.SavedAccessPointsWifiSettings;
import com.android.settings.wifi.WifiSettings;
import com.android.settings.wifi.p2p.WifiP2pSettings;
import com.android.settings.WifiCallingSettings;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -302,6 +303,8 @@ public class SettingsActivity extends Activity
AppNotificationSettings.class.getName(),
OtherSoundSettings.class.getName(),
ApnSettings.class.getName()
QuickLaunchSettings.class.getName(),
WifiCallingSettings.class.getName()
};