[automerger skipped] Import translations. DO NOT MERGE am: 7cc5e8d4d8 -s ours am: 99a7f5c1e1 -s ours
am: ad231edc42 -s ours
am skip reason: subject contains skip directive

Change-Id: I9bc50a9f7df6080e20c263c52611e2dd5e332b1e
tree: 468dba815d1d979aa6264a4ba43852cacfb01b6c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg