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

Merge commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd' into kraken

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