commit 97246649e4e10ab36f9f63c8124b06aea1fea6e7
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 10 01:38:51 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 10 01:38:51 2023 +0000
tree 2984bad6bec5a25287062c005ffd6e1906296832
parent 656d481e18aeaff29ca0e9404877939ec5949bc3
parent 1c503fed673143e7c30b5eb04b0355da41e9e59f

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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: acf52df7a6 -s ours am: eaeb26adb0 -s ours am: ea17648df4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b3e4d7886f -s ours am: 109fbe94d7 -s ours am: 5faf8d80c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1033a2abc6 -s ours am: 2df55e14e4 -s ours am: 26f905aea0 -s ours