am 85cd2c56: am 9b8055b3: Merge "Fix a regression in exiting the activity on picking a locale" into jb-mr1-dev

* commit '85cd2c562545ce1d498f52430a9094071d164311':
  Fix a regression in exiting the activity on picking a locale
This commit is contained in:
Amith Yamasani
2012-10-12 11:03:26 -07:00
committed by Android Git Automerger

View File

@@ -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);
}
}