commit fe037fff2b619a4caa761b2d1d37c38c3a5c7363
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 16 17:56:51 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 16 17:56:51 2024 +0000
tree db2df82531c5262d6094b137a2a340ebed257b1c
parent 13cdbdf68af3b4cf84e37b3bd9d932281ebeb882
parent c4419857d910cd8b30724afe0f65d85b8ea496df

Merge changes from topic "am-3c320492c6064dff82f4c26616d2a5e5" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f6d9c8f8da -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1b214cb88 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: c2d30c8e73 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22eb84ad97 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 42e8f3f44e -s ours