tree b5f32b3f0d6828f85654b97d8a8682c7e526e726
parent a41423d329ba8f227f934f4b9efe173718a28525
parent 9c2f8a0852f7dae1ff63cce0fe35647de3af7523
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664172428 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1664172428 +0000

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 67fdce4f40 -s ours am: 17abe09fc9 -s ours" into tm-qpr-dev-plus-aosp