am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo

Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp

* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
  Fix "p.m." in lockscreen (locale: es).