am f62cf88d: (-s ours) am 4069b050: (-s ours) am 2ba60e4a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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