[Pnalingual] Resolve code conflict.

Bug: 228292561 Test: local Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed (cherry picked from commit aac21a59aa)
2022-04-06 18:28:13 +08:00
parent a926f6ddbc
commit 6436a5aa6f
1 changed files with 11 additions and 11 deletions
--- a/src/com/android/settings/localepicker/AppLocalePickerActivity.java
+++ b/src/com/android/settings/localepicker/AppLocalePickerActivity.java
@@ -153,8 +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()