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