am 3d9678ce: (-s ours) am b66b7151: (-s ours) am 92c4c9ea: (-s ours) Import translations. DO NOT MERGE

* commit '3d9678cef03bd14cab8a9e777631afd0d2fea759':
tree: f5f2cf38e2475ee7ef8ae40a7a0144d7856e0418
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml