am 60f6aa3b: (-s ours) am c17079e3: (-s ours) am 81295a0e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '60f6aa3b38ef467e65a43651d77c8b59cb763efe':
  Import translations. DO NOT MERGE
tree: ecfe4b336de47f713352654de9d57795cf21cbfd
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml