Merge "Update language to comply with Android's inclusive language guidance"

src/com/android/settings/development/DefaultLaunchPreferenceController.java

@@ -24,7 +24,7 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 /**
  * This controller is used for preference that has fragment or launch intent defined in the
  * preference xml, and do not need any handling to update the preference state, except when the
- * master developer options switch is turned on/off, the preference needs to be enabled/disabled.
+ * primary developer options switch is turned on/off, the preference needs to be enabled/disabled.
  *
  */
 public class DefaultLaunchPreferenceController extends DeveloperOptionsPreferenceController

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

@@ -189,7 +189,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
             getPreferenceScreen().removeAll();
             return;
         }
-        // Set up master switch
+        // Set up primary switch
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBarController = new DevelopmentSwitchBarController(
                 this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,

src/com/android/settings/development/WirelessDebuggingPreferenceController.java

@@ -43,7 +43,7 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
 /**
- * This controls the master switch controller in the developer options page for
+ * This controls the primary switch controller in the developer options page for
  * "Wireless debugging".
  */
 public class WirelessDebuggingPreferenceController extends DeveloperOptionsPreferenceController