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

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