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

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