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

Change-Id: I28610419a0520bf3d832f81edb50a23374e51dfb
tree: fe8447b98cb091e82bc42fce8703423210644a19
  1. perf_tests/
  2. res/
  3. src/
  4. tests/
  5. Android.bp
  6. AndroidManifest.xml
  7. proguard.flags