resolved conflicts for merge of f89dc7c9 to master

Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc

src/com/android/settings/wifi/WpsDialog.java

@@ -133,7 +133,6 @@ public class WpsDialog extends AlertDialog {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTitle(R.string.wifi_wps_setup_title);
         mView = getLayoutInflater().inflate(R.layout.wifi_wps_dialog, null);
 
         mTextView = (TextView) mView.findViewById(R.id.wps_dialog_txt);