[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d7f8cebd3 -s ours am: 8dce69988f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18693057 Change-Id: I84c74a618a1005185eb9fefb3f5d1ee929cc6fea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: