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

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