commit f98ebd4d64b8c455c84b9710f2d8dbbf10a7c395
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 25 08:54:25 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 25 08:54:25 2023 +0000
tree 6886add2ac995bf65a44dae218f696d794d7044f
parent be60f1bf9841cd1f1a21afd5ff6ebdffb7e0e01b
parent c2421cbd815e3e5af8128f06df7a0f4ba122e4de

Merge changes from topic "am-bffb9ddeb0de4c15a168076e3071b9c6" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1db9734846 -s ours am: 314228cc85 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3bf7dfef38 -s ours am: dffcb2da53 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 76415d52e6 -s ours am: 29ee2a1209 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 384529bc83 -s ours am: 54cb1f672e -s ours