* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 04aa4987 -s ours am: 4f1112f9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8c47512a -s ours am: 6c1e6257 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9fa8c43b -s ours am: 198b2ba0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff1a9f2b -s ours am: e7599b7d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 308f47a7 -s ours am: 37044330 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4f57d2ac -s ours am: 773f1aea -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 552ec974 -s ours am: b5856815 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e78bc497 -s ours am: 572adb66 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fd6a563f -s ours am: 7d525849 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9cc7f04 -s ours am: c1b67f72 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 33276348 -s ours am: 904ad3fe -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecaeb331 -s ours am: 741d0bd6 -s ours