* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dc0e83ef -s ours am: d5e7a74a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: baa0e94e -s ours am: ee82eb38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: cd6a44ec -s ours am: aebb6fcd -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 44c2d6f7 -s ours am: 7b18d79c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 19be9460 -s ours am: 07f50387 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 350b7636 -s ours am: 8e2270f7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2c5f4414 -s ours am: e252fdca -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b78f665c -s ours am: 5ded3acc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a736a562 -s ours am: 5756e0dc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b95e0349 -s ours am: ca2a8ba7 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 128170bc -s ours am: 13879010 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84ca2f0 -s ours am: e6cc22c8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 794d30f7 -s ours am: 9d9e6b45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9290c622 -s ours am: bdd7974c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1cfabdbb -s ours am: dcf767a6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3be20cf -s ours am: 7ec32c90 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c8432ce7 -s ours am: bdb92873 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5de78462 -s ours am: e8ddcb54 -s ours