am 25510e07: am 8071b146: am fb872d1a: Merge change Id4d04def into eclair

Merge commit '25510e077766cf023dd0adb9c84d6d5f82cc01bc'

* commit '25510e077766cf023dd0adb9c84d6d5f82cc01bc':
  Fix a race that kept the locale picker from working under heavy CPU load.