tree 49812e2acb2bd5a636ba6fd91a2a89a9eb57d4c4
parent 1eca47e3cb737c83a5f1ca0c351311bd99cc755d
parent 9cc9dfb807a89670235221d731bee03c34ed0c8c
author Treehugger Robot <treehugger-gerrit@google.com> 1619119660 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1619119660 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9a162a8125 -s ours am: 9cc9dfb807 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0f600c2ddbf42cc3cc723c0e517b1284f009dfc5