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

* commit '1e99421196c1b34363267d6e6f02b16a299c9012':
  Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)

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

..

java

am 720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1

2011-12-07 11:02:38 -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