am a2b29d5f: (-s ours) am 58965944: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a2b29d5f9bda8a0019f57a737d06a7a24814c3bc':
  Import translations. DO NOT MERGE
tree: 3d9832ebe642aff4c9f9e7507990aadc668bb538
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags