Eric Fischer bcd96b36d0 am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 ...

* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
  Import revised translations.  DO NOT MERGE

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

..

java

resolved conflicts for merge of ea25ea7e to ics-aah

2011-12-07 10:47:48 -08:00

jni

am 4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1

2011-12-07 09:27:41 -08:00

res

am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1

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

tests

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

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