* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 458a0764 -s ours am: 709ef988 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 410d423a -s ours am: 1eec2858 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 76151085 -s ours am: 81debdb0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84129b3f -s ours am: ef599f85 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f7f095d -s ours am: ddae7013 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16ca9f32 -s ours am: 1dc120e2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c25e25e5 -s ours am: ebd6a248 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a037fe57 -s ours am: 04992dcf -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7e6bc677 -s ours am: 5325afc5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ef1f43b -s ours am: 6cee4a6b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4a6942e3 -s ours am: ca298606 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d861ddb9 -s ours am: 115c49db -s ours