am 6642817b: (-s ours) am cb21f780: (-s ours) am a948c231: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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