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

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