commit 7bc2f40fc0fca9af28897b48bbd8bffb9b129019
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jan 04 01:50:03 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 04 01:50:03 2024 +0000
tree 3cb6f080d09175255c19832cf4b0108af32403a9
parent 2e76468c158ddecbf22ab33c8f525b0e79382ca1
parent d69095054eed4738405d33982f560cd8d6c85c4c

Merge changes from topic "am-28715fbefc2c44e5ae5a9c401bb9bb6f" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 7daf196375 -s ours am: 85b5f93bd2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0281c03b84 -s ours am: 0b71a5a480 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 97b322847a -s ours am: bc2554a8e0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f642a33f38 -s ours am: f131078199 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: c55b27b079 -s ours am: 6765caae98 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 84a6297bbd -s ours am: 43575e12c3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 8afb775cbf -s ours am: 0098f592e0 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9b33a71691 -s ours am: 276c16bd28 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 9585783d07 -s ours am: d7d5416a8c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbc5088f91 -s ours am: 801f7423b2 -s ours