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

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