commit 633c87b8cc07f1fff4ae54a5072caa69ddff06e6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 22 00:03:50 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 22 00:03:50 2022 +0000
tree 9dabd629144e149817f0c83b127f729097cff07c
parent 0d6e7c475cde65a6a8c7f352029de2a0e8d0cdef
parent dc325d7b00a080d4a7673ed2835fc8d106760d39

Merge changes from topic "am-add98e558e714afdb507c739986ad650" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 5f9f05d10a -s ours am: cdc16c0b5b -s ours am: ab2953d122 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adbfe4344e -s ours am: 4f04164e65 -s ours am: c3a0f21946 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 734615d958 -s ours am: 3b105960fd -s ours am: 3842d4732d -s ours