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

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