am f48b416e: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'f48b416e9806f374f95cfcfc35b60db82bb272a8':
  Import translations. DO NOT MERGE
tree: cbcc19f512d92178b25da7ab9ce04eaaabc3ae16
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py