[automerger skipped] Import translations. DO NOT MERGE skipped: 6a98a579a8 skipped: 13c1fc28d6 am: 30bed7b0a2  -s ours am: a47787371c  -s ours
am: 9bb8d48894  -s ours

Change-Id: I8605bce8513793a195db07e21a843d8bc8fd4b89
tree: 7e71b71d463f5092fe358eabdcfb6c95e0a6ed78
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk