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.