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