[automerger skipped] Import translations. DO NOT MERGE am: 0a2ed801db -s ours
am: 61564d79ab -s ours
am skip reason: subject contains skip directive

Change-Id: Iac12de84eb9ca67cd947325a99be68aee17f45b6
tree: fcc0349353273aa62f307117a83b9f1fdb7bbef0
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml