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

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

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a9ca289869 -s ours am: 1e653ead9b -s ours am: 06017b537d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5f9d0f5745 -s ours am: f0baa56a13 -s ours am: cd84d42d3f -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8969cbd812 -s ours am: da049e6291 -s ours am: 11c214318b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7228d548b7 -s ours am: f40638cef4 -s ours am: 5fceb6adbe -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfc901e6e3 -s ours am: ea4821f375 -s ours am: e7a28ae77d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76f4556104 -s ours am: 585d443663 -s ours am: 449370c078 -s ours