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

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