am 1562e63c: Merge change I2a48162f into eclair-mr2

Merge commit '1562e63ce6ac3be1ac6602c10ffca0393b485c34' into eclair-mr2-plus-aosp

* commit '1562e63ce6ac3be1ac6602c10ffca0393b485c34':
  Update lock screen alarm info when the locale changes.
tree: 1fde6467a71a0142e2137c55be7b993afb480ec5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE