Bart Sears 3edc62bc35 am b56076ac: Merge "Fix WebTextView rings" into ics-mr1 ...

* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
  Fix WebTextView rings

2011-12-07 11:43:27 -08:00

..

java

am b56076ac: Merge "Fix WebTextView rings" into ics-mr1

2011-12-07 11:43:27 -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 f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1

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

tests

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

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