am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '3da05cbfbad836707db214ee9a5346527fb49373':
  Import translations. DO NOT MERGE
tree: f0dc34a411a6160bdb2fc7c0c5abc98e88bc2e47
  1. canon/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml