am 823edb76: am 532d5603: Merge change I80022375 into eclair

Merge commit '823edb76661d57c1af7dbf4eb56eb0e3cb78e229' into eclair-mr2-plus-aosp

* commit '823edb76661d57c1af7dbf4eb56eb0e3cb78e229':
  Fix issue #2256032: Change CONFIGURATION_CHANGED and add a locale changed broadcast