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

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