tree 999271e5acef206d196c847b6808bb14cb144d23
parent 7ef1786cbf78d877606322b3c744e94de277318b
parent 97714cd3529601ff5d0721795e46c2ba4d6743f1
author Treehugger Robot <treehugger-gerrit@google.com> 1599208458 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599208458 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21952d24d6 -s ours am: 0d6d7a7495 -s ours am: c8581eab83 -s ours am: 97714cd352 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I849f2f101a0db5cf8db79d93b3060edb9c78c7ac