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

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