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

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