am 2e800c01: (-s ours) am 70f7b1b6: (-s ours) am cb9247ce: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '2e800c017bc4400a360d002db5767a2142710186':
  Import translations. DO NOT MERGE
tree: 0ab9f5066e7fe522540774e39282baffb608138f
  1. res/
  2. src/
  3. .gitignore
  4. Android.mk
  5. AndroidManifest.xml
  6. project.properties