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

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