am d48e7b85: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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