am c846fcc2: (-s ours) am 1e73eb40: Import translations. DO NOT MERGE

* commit 'c846fcc2571b1760e3e0f9be7627051b81ef2b48':
  Import translations. DO NOT MERGE
tree: b1d19690c58d0b192d0c8c7bfc896ef70e065736
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml