* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 04aa4987 -s ours am: 754bc555 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c47512a -s ours am: 2ed41e17 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9fa8c43b -s ours am: 097fec31 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff1a9f2b -s ours am: 4bf4ae8e -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 308f47a7 -s ours am: 2dfbe8b2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f57d2ac -s ours am: eccdc68b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 552ec974 -s ours am: 4d6605a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e78bc497 -s ours am: 7e0df14f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fd6a563f -s ours am: 1fa65524 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9cc7f04 -s ours am: 180fa184 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 33276348 -s ours am: 3c571c01 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecaeb331 -s ours am: ca406996 -s ours