am e7fa6d48: (-s ours) am 0ea55afd: (-s ours) am 5a194cd1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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