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

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