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

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