commit | 2e8038190f7f003a16a6a0bbac48beabcf5512a1 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 17 04:44:47 2022 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 17 04:44:47 2022 +0000 |
tree | 03d8a99f98fbe6f9b66dd25386796ead9dc85e1c | |
parent | 1c7cf126c4d5c72293116ea202e9f860c0d1b388 [diff] | |
parent | cdb466e5e06e7bb24a6c4493327473b7501b1ce8 [diff] |
Merge changes from topic "am-ff01169247bf4933aa25a2236b021ef2" * changes: Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e3b9aafec -s ours am: a4523bdf81 -s ours am: cd5fd2b286 -s ours" into tm-d1-dev-plus-aosp am: ddef75a61b -s ours am: 80d733db18 -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2e3b9aafec -s ours am: a4523bdf81 -s ours am: cd5fd2b286 -s ours am: 593cc8a801 -s ours am: 10712a239d -s ours