am cc4970e5: (-s ours) am 08fcfaf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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