am 08ca5d2e: (-s ours) am 522ec483: (-s ours) am a2b29d5f: (-s ours) am 58965944: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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