commit 4cdfacacef9beca9047c2f48b0edb32de362b650
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 01 17:48:07 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 01 17:48:07 2023 +0000
tree 4552e32cbe90089451baaa53be36a23f78b98865
parent 1b2f70519bb12d76ee78deaad46b0f45bd4abd63
parent 8e4bce9f32529eac67e452c3e82fe8e2f3aea9d6

Merge changes from topic "am-99e883e856064d17ba153ec8074ac96d" into udc-qpr-dev

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2d92b9436e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 43df075e3d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 6c5c0bbb52 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f5384e864 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 9e68c2719d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d99b111ad -s ours