am 905291b9: (-s ours) am ca15d0a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '905291b92e99489613b7f85bed197c440033299e':
  Import translations. DO NOT MERGE
tree: 8e198f40ed3e1d630d1d01afc83c9a63ec4e661d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags