Matthew Xie dda9a61f2a am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 ...

* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting

2011-12-12 12:10:10 -08:00

..

java

am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

2011-12-12 12:10:10 -08:00

jni

am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1

2011-12-07 11:02:58 -08:00

res

am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

2011-12-12 11:06:33 -08:00

tests

Merge "Add extra 2 minute for wifi to shutdown" into ics-mr1

2011-12-05 15:52:34 -08:00