[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: f45b46f602 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c2f5a1c864a0d3da445557ab4bc217ed916aff4
tree: 692c5cd514bdfb7e9811581a541b9773d2e31bd8
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS