am 454e1afb: (-s ours) am d251c54c: (-s ours) Import translations. DO NOT MERGE

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