[automerger skipped] Import translations. DO NOT MERGE am: 6b2c43a4af  -s ours
am: 6ba0a1eb9f  -s ours

Change-Id: If1801ef17b009c1a09cd8d53e14627bda8f51968
tree: a037e70d45815c78de5627db55dd62528b7e26a6
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags