Merge changes from topic "am-99e71ad1563b4cdeb52b5ebeabd86305" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0e7e53e82d -s ours am: d2a0fab08a -s ours am: dfa7b4cd94 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1efe0b478 -s ours am: ff5282b061 -s ours am: a20937f33b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 226302d049 -s ours am: 06f2d4e482 -s ours am: 25964df157 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9783f0953 -s ours am: 31d6ccbebc -s ours am: b8f5135b82 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1f7457e1c -s ours am: ea10b5ba32 -s ours am: 4697c136a4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a5896afd27 -s ours am: c55d9a382e -s ours am: 5d9a720ca3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d2a0a8d38f -s ours am: 0de66816fa -s ours am: 837e4a8704 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99938cce42 -s ours am: ff7a1a3a6b -s ours am: edb612657c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 9292a63fa0 -s ours am: 957283c4e4 -s ours am: 7cf5e85524 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4991792ec5 -s ours am: 0c4e2734b9 -s ours am: 9482676116 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c98d4d762 -s ours am: 2e5ff0e5bc -s ours am: 0278bc72a0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f6c069998 -s ours am: 715f787c78 -s ours am: ff8f60f6ce -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 0a3e2c80d9 -s ours am: 3dc8ae99ad -s ours am: fe640253e6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9fc5f8b101 -s ours am: 54712f952e -s ours am: a006f91152 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: e034ac71f3 -s ours am: 5221036214 -s ours am: bc523453ec -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4c343e36e -s ours am: 5dd9f7626f -s ours am: 5521cb7fd1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb62b7487a -s ours am: 0ddc1e2a3c -s ours am: 877d9d3fd8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e1e099e9c -s ours am: d1771647c5 -s ours am: 2f50bfa03c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: f9238c40f1 -s ours am: 5e4a37ac24 -s ours am: c0719b777d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f644931c8b -s ours am: cab17780f8 -s ours am: 5f22285303 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1e599a623 -s ours am: e377576311 -s ours am: 4dd27af678 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 74518b5f85 -s ours am: 8dc6048c7a -s ours am: 56b8c1e1bc -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3980123b09 -s ours am: 4d1bd46086 -s ours am: 943817bb08 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29685d41e5 -s ours am: 2a7bb11630 -s ours am: f594903e04 -s ours

This commit is contained in:

Automerger Merge Worker

2023-07-27 21:29:08 +00:00

committed by

Android (Google) Code Review

parent c23b10ea15 26ade926fa

commit 2f1a55daf6

Merge changes from topic "am-99e71ad1563b4cdeb52b5ebeabd86305" into udc-qpr-dev-plus-aosp

Diff Content Not Available