Merge "[Pnalingual] Resolve code conflict."

2022-04-06 10:38:08 +00:00
parent 4a12af2cf8 aac21a59aa
commit 444c4868ee
1 changed files with 11 additions and 10 deletions
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -153,7 +153,8 @@ public class AppLocalePickerActivity extends SettingsBaseActivity
                            View v,
                            Bundle savedInstanceState) {
                        super.onFragmentViewCreated(fm, f, v, savedInstanceState);
-                mLocalePickerWithRegion.getListView().addHeaderView(launchAppLocaleDetailsPage());
+                        mLocalePickerWithRegion.getListView()
+                                .addHeaderView(launchAppLocaleDetailsPage());
                    }
                }, true);
        fragmentManager.beginTransaction()