tree b5f32b3f0d6828f85654b97d8a8682c7e526e726
parent 7a8d2ff1482b0354c20ed79e233f6b498c0408b7
parent 42c1e0355d516db19128e10112cc144561a832c1
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662327295 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1662327295 +0000

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f1eff4b96 -s ours am: de0b52b724 -s ours" into tm-qpr-dev-plus-aosp