[automerger skipped] Import translations. DO NOT MERGE
am: ff2c24712b -s ours
am skip reason: subject contains skip directive

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