Merge "[WifiDialog] Suppress activity transition"

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

@@ -60,6 +60,12 @@ public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialo
         dialog.setOnDismissListener(this);
     }
 
+    @Override
+    public void finish() {
+        super.finish();
+        overridePendingTransition(0, 0);
+    }
+
     @Override
     public void onForget(WifiDialog dialog) {
         final WifiManager wifiManager = getSystemService(WifiManager.class);