commit e69a4e893498447156368739296a2602176ceba2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 25 22:51:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 25 22:51:45 2023 +0000
tree 35be2f722d272bb14a41ec0ab2c9325ffab45165
parent 0e109cd959f13b3844ec10dbcd371554497ba68f
parent fc251808488691553489f81456bda58fbf3577d9

Merge changes from topic "am-4fd26709498342da93912fba9cfb0331" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a9ca289869 -s ours am: d8ba8bbb23 -s ours am: ec4b1a5de8 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f9d0f5745 -s ours am: f4ddd189b4 -s ours am: af244deb2b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8969cbd812 -s ours am: 46a53b930d -s ours am: dd0d779fda -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7228d548b7 -s ours am: 4e05b640f7 -s ours am: e1553404de -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfc901e6e3 -s ours am: fdd1bced65 -s ours am: e6042db7b2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f4556104 -s ours am: f05010714f -s ours am: 57ca8a3db4 -s ours