[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours am: 4a28946f40 -s ours
am: 673e5d6d21 -s ours
am skip reason: subject contains skip directive

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