tree 1668ef159563f9c30d8c0d5c2ca88850dcb012e5
parent 1d40d06532d2a8df293376b75d4272399ef4005a
parent 9941d8e007b0c3fbab7b7606d282cd6f4d4b0982
author TreeHugger Robot <treehugger-gerrit@google.com> 1616424474 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616424474 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9941d8e007 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I43364bcaa129eee2c2e7be575cdc04da4a728a7b