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

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