Eric Fischer 669403e538 Merge "Import translations. DO NOT MERGE"

2012-05-04 14:16:51 -07:00

..

java

am db2a68f3: am df35aa45: Merge "Verify attached before showing a dialog" into jb-dev

2012-05-04 14:09:44 -07:00

jni

Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev

2012-05-04 13:12:23 -07:00

res

Merge "Import translations. DO NOT MERGE"

2012-05-04 14:16:51 -07:00

tests

am 3ddb4f80: am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev

2012-05-04 12:59:11 -07:00