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

Change-Id: I081c69058b37c134f1365719faf42e914ffc2bc9
tree: 55786573d3cfb58fae53085826d4477522c933b4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS