commit 78e5497bbb3ec6988c8a8da9b5a2790852a4492f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Aug 21 08:33:15 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 21 08:33:15 2024 +0000
tree eff0170b0afd8c6cae6410626c6e023b3ea046a7
parent 422a2ca6f762242ef62981a7cd69f9990a86db66
parent ed66daed0691a8dfc3f6ca68d0f96c895f44263f

Merge changes from topic "am-dba65413913b4cad9a9031cd6dbbedf2" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 9129db336d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67236edd53 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 3e129c8095 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23f86c4d54 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: cd16f3f5ab -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8cef95a1fd -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: e9546f47b4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9a1597dbba -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: bfe5e4d141 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c0d7cf648d -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f221f45790 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7c75f0beb3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: d8ba986b66 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbca3a5a1a -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89fcef9ba7 -s ours