am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'bc01c0e88cc059dc725a535cd1e111e59888ca68':
  Import translations. DO NOT MERGE
tree: 26cf24d6872288bdf87d17a8d1e1c017e1eebf5d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags