commit 80cc76eda40f48ab19b517a84f2a9ae0cdb51270
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 31 21:31:17 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 31 21:31:17 2023 +0000
tree 8d8c2728ea0ced87f5c5cefa46c3c7939077267a
parent a63c9b0a73b0065d44ee894f76cc42199c7a6e85
parent 56d5a70aa0bb0c92e43d0c73a55431f2ec831078

Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours am: f3392e54a5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours am: 27207b8ba2 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours am: 055f0b6e04 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours am: 108e964377 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours am: 9638eb7317 -s ours