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

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