Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev

am: ffea17b57f

Change-Id: I4295f1c186863d157520d93abfe0cbaf3c354247

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

@@ -860,6 +860,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
                 onPreferenceTreeClick(cb);
             }
         }
+        if (mBluetoothEnableInbandRinging != null) {
+            mBluetoothEnableInbandRinging.setChecked(true);
+            onPreferenceTreeClick(mBluetoothEnableInbandRinging);
+        }
         mBugReportInPowerController.resetPreference();
         mEnableAdbController.resetPreference();
         resetDebuggerOptions();