Xia Wang 3e6c169613 am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo ...

Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp

* commit '11505b474b16457fb65952aadba0609cb33de8e7':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.

2010-05-06 16:12:38 -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

merge from open-source master

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

tests

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

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