commit 3113c210d6d01fc5f386d99d8fb41f1f375d2bb1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 03 05:13:45 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 03 05:13:45 2023 +0000
tree 8b21c801259015d8f339eaf12037611243c7acdc
parent 2b1fcf52bd1f3571d761eab192df0d3382cf2451
parent 8f86536b381e64414df292f06a428a5a151a2c0a

Merge changes from topic "am-36bdf5682c8d45d1b2598533ab882f2d" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours am: bef7ad1471 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours am: ccdb8bd50e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours am: 72d054d599 -s ours