[automerger skipped] Import translations. DO NOT MERGE am: 22f5d8c514 -s ours am: 0f8d3cb707 -s ours am: cfc6d032dc -s ours
am skip reason: subject contains skip directive

Change-Id: I8d10b47be88a45641dbdbf23cb26925d5384c8bd
tree: 790a324548a9588a16b24f0f7be3ed8d81bd2e82
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml