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

Change-Id: Iebca720a1ca208fac6543b9f005f781540091e8c
tree: 76b698675afe63da9ab46c2a2b22b97b2a216279
  1. art/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml