am ef964985: (-s ours) am 529b37ea: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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