am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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