tree a8a3ec1028e15fbeb3c512b96fd74cf6b977685c
parent a13faee19f76085ce557b948cf014057eabeff74
parent f8c312b9281a8c1f9014dfe1695f1c41a3b55ab2
author TreeHugger Robot <treehugger-gerrit@google.com> 1592935748 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592935748 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8e993c4d5db1351d7fba43ccf296fcfb7e4d021f