tree 745ec750faaaf5e297e6ce4058df6d03afa7d833
parent dd8244ab0c8701f8f7a7202049581bc812d64bce
parent 065294ed13d6eb9b06e29482c72440b988b0b41c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1590910595 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1590910595 +0000

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 85215ae5cf -s ours am: 68c66edb2d -s ours" into rvc-d1-dev-plus-aosp