[automerger skipped] Import translations. DO NOT MERGE am: 7123096bf8  -s ours
am: 8345288bda  -s ours

Change-Id: I2f5abbf12f07c0c0b09d1cd59c5cd43e5417aa56
tree: 79813b6a37595debeeb0ab3110fdf93cb9c5cdde
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml