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

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