[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: cbb6e97037 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic50bce3264dd0f4407db1b7e7b45b0c0e9e7b790
tree: 1a5b7a35e4fe6e1ce349ff0362c830bbf28fe4ed
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg