commit 6f807ebf1117a9f510f09700e03b7fcf0da7662d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Aug 31 20:25:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 31 20:25:45 2023 +0000
tree b12941b3c5984aad48b2c9b8f8eab0ecb096395e
parent d1616c60a3154a78cb71a900b660a5a80ff8542d
parent 14b51e0e37a748736a2495bd8c732d63f9a0b501

Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 44ba06430a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b0a6787bd1 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 21335a6957 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ecd0754441 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fb8f731c8 -s ours