[automerger skipped] [manual merge] Import translations. DO NOT MERGE ANYWHERE am: 7921912f19 -s ours am: d82b0e099d -s ours am: a4e41abf80 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21548090 Change-Id: I184814bbd94bcfef8388348cc1dadb3186b866c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: