Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev

src/com/android/settings/LocalePicker.java

@@ -55,6 +55,7 @@ public class LocalePicker extends com.android.internal.app.LocalePicker
             mTargetLocale = locale;
             showDialog(DLG_SHOW_GLOBAL_WARNING);
         } else {
+            getActivity().onBackPressed();
             LocalePicker.updateLocale(locale);
         }
     }