[automerger skipped] Import translations. DO NOT MERGE
am: ef8c7b5bc5  -s ours

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