Daniel Sandler ad2f9ff786 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).

2010-05-06 17:24:22 -07:00

..

config

…

java

merge from open-source master

2010-05-05 15:57:42 -07:00

jni

Call register_localized_collators() with the current locale.

2010-05-05 09:01:48 -07:00

res

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

2010-05-06 17:24:22 -07:00

tests

Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.

2010-05-06 14:58:40 -07:00