Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev

src/com/android/settings/localepicker/LocaleListEditor.java

@@ -329,6 +329,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment {
         list.setLayoutManager(llm);
 
         list.setHasFixedSize(true);
+        list.setNestedScrollingEnabled(false);
         mAdapter.setRecyclerView(list);
         list.setAdapter(mAdapter);