Gilles Debunne 035b9c4099 am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1 ...

* commit '2df13452e05745a3da624c34018da983173c32c4':
  Insert into user dict with the correct locale

2011-12-07 18:42:07 -08:00

..

java

am 2df13452: Merge "Insert into user dict with the correct locale" into ics-mr1

2011-12-07 18:42:07 -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 cf6a6522: Merge "Raise touch slop value from previous experiment" into ics-mr1

2011-12-07 17:57:16 -08:00

tests

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

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