Merge "Import translations. DO NOT MERGE" into oc-dev
am: 69fe3e4678  -s ours

Change-Id: Ife0c099cf368e756f9ada5a88667563bcd90121a
tree: fc9702f012503330039033d43b48f09fe27ebb81
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml