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

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