tree 26d0b15c80aa8d253f2630c31c123e01f8e53053
parent 04c0296a72537e3902b46e4cded7366bd4281ab8
parent cce78f1da72e2885ba19d25064f0bc3ae219305c
author TreeHugger Robot <treehugger-gerrit@google.com> 1594044673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594044673 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566

Change-Id: I5dd1046edca766662509b03d4d58de9d1572f93a