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

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