Snap for 8036950 from 1ee60270df to tm-release

Change-Id: I890234a4029d3b9b0d5cc368b0c6d74de7d11a5e

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

@@ -17,6 +17,7 @@
 package com.android.settings.localepicker;
 
 import android.app.FragmentTransaction;
+import android.app.ListFragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -47,6 +48,14 @@ public class LocalePickerWithRegionActivity extends SettingsBaseActivity
                 .commit();
     }
 
+    @Override
+    protected void onStart() {
+        super.onStart();
+        final ListFragment listFragment =
+                (ListFragment) getFragmentManager().findFragmentById(R.id.content_frame);
+        listFragment.getListView().setNestedScrollingEnabled(true);
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == android.R.id.home) {