[automerger skipped] Import translations. DO NOT MERGE am: 3aa88b0aa6 -s ours am: c727975eb2 -s ours
am: a95aff57e6 -s ours
am skip reason: subject contains skip directive

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