Diff - 4b027e6ebf4acc861e405df3cb969863290a219e^2..4b027e6ebf4acc861e405df3cb969863290a219e - android_packages_apps_Settings

commit	4b027e6ebf4acc861e405df3cb969863290a219e	[log] [tgz]
author	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>	Tue Jul 09 20:09:43 2024 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Jul 09 20:09:43 2024 +0000
tree	8e9b8958e4ad2c516bc9c6ce9a3af67e8fdaab73
parent	1380a1902dd317eb3eadb82063f8769f9bd4ac8b [diff]
parent	6acaa589af956e2dc46860042c86456ddfd47d1d [diff]

Merge changes from topic "am-04e1c042090b48509e2682b5fa012fbf" into main

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 8499f60001 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb46b1dc9c -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 19edd63f45 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 86a87925f6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: edc6ee27c2 -s ours