am ee189a11: am 1562e63c: Merge change I2a48162f into eclair-mr2

Merge commit 'ee189a11a6ce319bb4135a3aba9fcdbe4bf3e629'

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