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

Change-Id: Idabc3c8fff07120ebe9c9aaac3fd204de9727291
tree: 847bde34e76017e6a90cf2107c287761e502f7e0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS